Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beginning of the modular_lobotomy folder, a dangerous line to thread on #1902

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/vehicles/mecha/equipment/weapons/mecha_melee.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/mecha_parts/mecha_equipment/hammer
name = "Rhino Hammer (Red)"
desc = "Equipment for smashing and bashing. Does Red Damage"
icon = 'ModularTegustation/Teguicons/workshop.dmi'
icon = 'modular_lobotomy/icons/workshop.dmi'
icon_state = "hammertemplate"
color = "#db2121"
equip_cooldown = 15
Expand All @@ -16,7 +16,7 @@
/obj/item/mecha_parts/mecha_equipment/hammer/rhinoblade
name = "Rhino Hammer (Black)"
desc = "Equipment for cutting and slicing. Does Black damage"
icon = 'ModularTegustation/Teguicons/workshop.dmi'
icon = 'modular_lobotomy/icons/workshop\.dmi'
icon_state = "hammertemplate"
color = "#210f3d"
equip_cooldown = 15
Expand Down
243 changes: 122 additions & 121 deletions lobotomy-corp13.dme

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@
/obj/item/radio/headset/wcorp/welfare/head
name = "cleaver squad captain radio headset"
command = TRUE

Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,3 @@
to_chat(user, span_notice("You got a prize!"))
new reward(get_turf(src))
qdel(src)

//LC13 Rename of quantum pad
/obj/machinery/quantumpad/warp
name = "strange pad"
desc = "A strange pad that has a W corp sticker on it."
circuit = null

/obj/item/quantum_keycard/warp
name = "warp pad keycard"
desc = "A keycard able to link to a quantum pad's particle signature, allowing other quantum pads to travel there instead of their linked pad. The moment you use this card on a pad it will start teleporting to the cards pad."

/obj/item/package_quantumpad
name = "bulky W corp package"
desc = "Theres a warning on the side that when deployed they cannot be picked back up."
icon = 'icons/obj/storage.dmi'
icon_state = "alienbox"
var/amount = 2

/obj/item/package_quantumpad/attack_self(mob/living/user)
..()
if(amount >= 2)
to_chat(user, span_notice("You see another pad is still in the box."))
if(amount <= 1)
to_chat(user, span_notice("The [src] falls apart."))
qdel(src)
new /obj/machinery/quantumpad/warp(get_turf(user))
to_chat(user, span_notice("You open the box and a strange pad falls out onto the floor."))
amount--
26 changes: 26 additions & 0 deletions modular_lobotomy/code/items/quantum_pad.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/obj/machinery/quantumpad/warp
name = "strange pad"
desc = "A strange pad that has a W corp sticker on it."
circuit = null

/obj/item/quantum_keycard/warp
name = "warp pad keycard"
desc = "A keycard able to link to a quantum pad's particle signature, allowing other quantum pads to travel there instead of their linked pad. The moment you use this card on a pad it will start teleporting to the cards pad."

/obj/item/package_quantumpad
name = "bulky W corp package"
desc = "Theres a warning on the side that when deployed they cannot be picked back up."
icon = 'icons/obj/storage.dmi'
icon_state = "alienbox"
var/amount = 2

/obj/item/package_quantumpad/attack_self(mob/living/user)
..()
if(amount >= 2)
to_chat(user, span_notice("You see another pad is still in the box."))
if(amount <= 1)
to_chat(user, span_notice("The [src] falls apart."))
qdel(src)
new /obj/machinery/quantumpad/warp(get_turf(user))
to_chat(user, span_notice("You open the box and a strange pad falls out onto the floor."))
amount--
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,3 @@ GLOBAL_VAR_INIT(wcorp_boss_spawn, FALSE)
return
SSticker.force_ending = 1
to_chat(world, "<span class='userdanger'>All W-Corp staff is dead! Round automatically ending.</span>")

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/tresmetal
name = "tres metal"
desc = "Metal used for forging into workshop weapons."
icon = 'ModularTegustation/Teguicons/workshop.dmi'
icon = 'modular_lobotomy/icons/workshop.dmi'
icon_state = "tresmetal"
w_class = WEIGHT_CLASS_BULKY
var/quality = 0
Expand Down Expand Up @@ -54,7 +54,7 @@
/obj/item/hot_tresmetal
name = "heated tres metal"
desc = "Metal used for forging workshop weapons."
icon = 'ModularTegustation/Teguicons/workshop.dmi'
icon = 'modular_lobotomy/icons/workshop.dmi'
icon_state = "tresmetal_hot"
w_class = WEIGHT_CLASS_BULKY
var/matname = "tressium"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/workshop_mod
name = "workshop mod"
desc = "A workshop mod template. You should never see this!"
icon = 'ModularTegustation/Teguicons/workshop.dmi'
icon = 'modular_lobotomy/icons/workshop.dmi'
var/forcemod = 1
var/damagemod = 1
var/attackspeedmod = 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/ego_weapon/template
name = "blank template"
desc = "A blank template. You should never see this!"
icon = 'ModularTegustation/Teguicons/workshop.dmi'
icon = 'modular_lobotomy/icons/workshop.dmi'
force = 0
attack_speed = 1
damtype = RED_DAMAGE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/obj/item/forginghammer
name = "forging hammer"
desc = "Metal used for forging into workshop weapons. Use on hot tresmetal resting on an anvil to work it"
icon = 'ModularTegustation/Teguicons/workshop.dmi'
icon = 'modular_lobotomy/icons/workshop.dmi'
icon_state = "hammer"
w_class = WEIGHT_CLASS_BULKY

/obj/structure/table/anvil
name = "workshop anvil"
desc = "An anvil used by workshop offices. Put hot tresmetal on it and hit with a hammer to make a weapon."
icon = 'ModularTegustation/Teguicons/workshop.dmi'
icon = 'modular_lobotomy/icons/workshop.dmi'
icon_state = "anvil"
resistance_flags = INDESTRUCTIBLE
smoothing_flags = NONE
Expand All @@ -19,7 +19,7 @@
/obj/structure/forge
name = "workshop forge"
desc = "A machine used to refine tres metal into templates."
icon = 'ModularTegustation/Teguicons/workshop.dmi'
icon = 'modular_lobotomy/icons/workshop.dmi'
icon_state = "furnace_on"
anchored = TRUE
density = TRUE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/item/food/fish
name = "generic looking aquarium fish"
desc = "very bland"
icon = 'ModularTegustation/fishing/icons/fish_sprites.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/fish_sprites.dmi'
icon_state = "bugfish"
microwaved_type = /obj/item/food/cooked_fish
food_reagents = list(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "fish points"
singular_name = "fish point"
desc = "Brass pebbles that are used as a special currency by fishers."
icon = 'ModularTegustation/fishing/icons/fishing.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/fishing.dmi'
icon_state = "brassball"
w_class = WEIGHT_CLASS_TINY
full_w_class = WEIGHT_CLASS_TINY
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/obj/item/storage/bag/fish
name = "fish bag"
desc = "A weird plastic bag that can hold upto 100 fish or brass pebbles."
icon = 'ModularTegustation/fishing/icons/fishing.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/fishing.dmi'
icon_state = "bag"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS
resistance_flags = FLAMMABLE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/obj/item/clothing/neck/cloak/skill_reward/fishing
name = "legendary fisher cloak"
desc = "Worn by someone who has mastered the art of fishing and gained the attention of S corp."
icon = 'ModularTegustation/fishing/icons/clothes_items.dmi'
worn_icon = 'ModularTegustation/fishing/icons/clothes_worn.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/clothes_items.dmi'
worn_icon = 'modular_lobotomy/modules/fishing/icons/clothes_worn.dmi'
icon_state = "fishing_cloak"
associated_skill_path = /datum/skill/fishing

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
name = "unhinged fishing hat"
desc = "On the white part of this hat is the words: <span class='boldwarning'>Women fear me, fish fear me, men turn their eyes away from me as i walk, no beast dare make a sound in my presence, i am alone on this barren earth...</span> at the end of this manifesto is the picture of a very silly salmon."
icon_state = "fishing_hat"
icon = 'ModularTegustation/fishing/icons/clothes_items.dmi'
worn_icon = 'ModularTegustation/fishing/icons/clothes_worn.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/clothes_items.dmi'
worn_icon = 'modular_lobotomy/modules/fishing/icons/clothes_worn.dmi'
max_integrity = 1000000
// how many hats do we have in ourselfes?
var/amount = 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/obj/item/fishing_net
name = "fishing net"
desc = "This tool functions as a aquatic wall you can put down and just harvest the fish that get tangled in it."
icon = 'ModularTegustation/fishing/icons/fishing.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/fishing.dmi'
icon_state = "trawling_net"
w_class = WEIGHT_CLASS_HUGE
//Item deployment code is inside /turf/open/water/deep

/obj/structure/destructible/fishing_net
name = "fishing net"
desc = "A wall of twine and wires that traps fish. Alt click to harvest."
icon = 'ModularTegustation/fishing/icons/fishing.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/fishing.dmi'
icon_state = "trawling_net_empty"
anchored = TRUE
max_integrity = 5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/obj/item/fishing_rod
name = "ramshackle fishing rod"
desc = "A tool used to dredge up aquatic entities. Though since the pole is so weak you may as well be handline fishing, a technique where you hold the line with your hands."
icon = 'ModularTegustation/fishing/icons/fishing.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/fishing.dmi'
icon_state = "rod"
lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/fishing_component
name = "Its something you attach to a rod, certaintly, i think?"
desc = "If you see this, feel free to yell at the coders or mappers. Preferably both"
icon = 'ModularTegustation/fishing/icons/fishing.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/fishing.dmi'
icon_state = "reel_blue"
w_class = WEIGHT_CLASS_SMALL
// the bonus value that gets added onto fishing rods when the component is used on them
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/obj/item/fishing_component/hook
name = "simple fishing hook"
desc = "A simple fishing hook."
icon = 'ModularTegustation/fishing/icons/fishing_hooks.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/fishing_hooks.dmi'
icon_state = "hook"
/// icon state added to main rod icon when this hook is equipped
var/rod_overlay_icon_state = "hook_overlay"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/obj/item/fishing_component/line
name = "fishing line reel"
desc = "Simple fishing line."
icon = 'ModularTegustation/fishing/icons/fishing_lines.dmi'
icon = 'modular_lobotomy/modules/fishing/icons/fishing_lines.dmi'
icon_state = "blue"
var/line_color = "#808080"

Expand Down
1 change: 1 addition & 0 deletions tools/build/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const taskDm = new Task('dm')
.depends('tgui/public/*.bundle.*')
.depends('tgui/public/*.chunk.*')
.depends('ModularTegustation/**') // LOBOTOMYCORPORATION ADDITION ensure it also checks for updates in modular code
.depends('modular_lobotomy/**') // LOBOTOMYCORPORATION ADDITION
.depends('lobotomy-corp13.dme')
.provides('lobotomy-corp13.dmb')
.provides('lobotomy-corp13.rsc')
Expand Down
Loading