mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
8d5235713c
* Add files via upload * changed sigtech, tourist, and clerk icons added more detail to sigtech icon new tourist and clerk icons * Some more icon changes I uploaded the wrong file * applied grimm-hollowknight requested changes Adds new signal technician and paramedic hud icons and reverts clerk's back, all requested by grimm-hollowknight * ah, so thats why you reverted that change im dumb * why cant i merge upstream why github * Adds brig physicians Adds brig physicians as a new job. There are a lot of changes, but in short: - Added the job and many required things for it to work - Edited maps to add lockers, landmarks, and update the brig medbay - Added new clothing, PDAs, IDs, ect. * Fixed some stuff - Fixed some stuff I forget to change on some maps - Added new landmark icons * Removed Brig Physician's ability to be an antag Removed Brig Physician's ability to be antag and gave them a mindshield * Many requested changes - Removed the flash from the Brig Physician's starting equipment - Removed security access for non-skeleton crew and weapon access from the Brig Physician - Added skillcapes - Updated the Infirmary in eclipse and omega - Added a wall mounted flash on box - Added an anesthetic tank and medical mask to the Brig Physician's locker - Added icons for potential future support for the changes in #11744 * Another bunch of changes - Fixed a bunch of typos and minor mistakes (thanks TheGamerdk for pointing most of them out) - Added support for #11744 now that its merged - Fixed a merge conflict * Might fix one of the merge conflicts ahhhhhhhhhhhhhhh I had to redo ALL of the map changes, so that was fun * Should finally bring this back to a functional state Should fix some of the checks failing cause the Kilo file was messed up - Re-did the changes to Kilo - Fixed something I left in while testing stuff * Thought I fixed this - Fixes the Brig Physician's skill capes using the wrong job * Should fix wejengin2's issues with the maps Should fix most of wejengin2's issues with the map changes. - Changes all the emergency wall meds to normal wall meds - Might have fixed the APCs, but I don't know if I did it right - MapMerged Kilo - In Omega, I fixed the decals, added firelocks, and added vents/scrubbers in the brig infirmary - In Box, I re-added some of the missing items - In Delta, rearranged the lights and replaced them with tubes - In Meta, I moved the morgue tray into the unused space, moved the blood freezer into the office, and added a shelf in the infirmary * Bows, bamboo, and bones Ports the stuff * Before i get yelled at * ack * Some sprites I forgot to save * Syndicate bow * Map changes * Other bee ports This might be a bit too much to add * Fixes invisible bows in Fastdmm2 and a build error * oops * Some tweeks/fixes * More stuff Added more footwraps, ported tribal skirts, and fixed hardlight bows * merg * oops * aaa * Gramger Thanks Anvilman Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com> * Revert "Merge branch 'yogstation13-master' into tribal-crafting-port" This reverts commitb0396f5085, reversing changes made to3085d93160. * Revert "Merge branch 'tribal-crafting-port' of https://github.com/nmajask/Yogstation-But-Worse into tribal-crafting-port" This reverts commit32967243c7, reversing changes made tob0396f5085. * Fix * More fix * removes some stuff for now * fixed dart guns * Embed stuff pain * Update code/game/objects/items/stacks/sheets/sheet_types.dm Co-authored-by: Theos <theubernyan@gmail.com> * ADMIN LOG: A * fixes * pain * less debug * Readd the changes * balance * hardlight bow stuff * bamboo * starting recipes and stuff * More clothes Ports some stuff * Adds the clothing to the map * balance * Slug fix * MELEE! * Crossbows * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Update code/modules/projectiles/projectile/reusable/arrow.dm Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Hardlight bow arrow embedding * Ashwalker nest tweaks * Balance Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> * Bow fixes and minor balance changes * Im dum * fix * Update code/modules/projectiles/boxes_magazines/_box_magazine.dm * reorganized crafting menu aaaaaa * huh * fex * removed broken code Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com> Co-authored-by: Theos <theubernyan@gmail.com> Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
60 lines
1.5 KiB
Plaintext
60 lines
1.5 KiB
Plaintext
/obj/structure/headpike
|
|
name = "spooky head on a spear"
|
|
desc = "When you really want to send a message."
|
|
icon = 'icons/obj/structures.dmi'
|
|
density = FALSE
|
|
anchored = TRUE
|
|
var/obj/item/twohanded/spear/spear
|
|
var/obj/item/bodypart/head/victim
|
|
|
|
/obj/structure/headpike/glass //for regular spears
|
|
icon_state = "headpike"
|
|
|
|
/obj/structure/headpike/bone //for bone spears
|
|
icon_state = "headpike-bone"
|
|
|
|
/obj/structure/headpike/bamboo //for bamboo spears
|
|
icon_state = "headpike-bamboo"
|
|
|
|
/obj/structure/headpike/CheckParts(list/parts_list)
|
|
victim = locate(/obj/item/bodypart/head) in parts_list
|
|
name = "[victim.name] on a spear"
|
|
..()
|
|
update_icon()
|
|
|
|
/obj/structure/headpike/glass/CheckParts(list/parts_list)
|
|
spear = locate(/obj/item/twohanded/spear) in parts_list
|
|
..()
|
|
|
|
/obj/structure/headpike/bone/CheckParts(list/parts_list)
|
|
spear = locate(/obj/item/twohanded/bonespear) in parts_list
|
|
..()
|
|
|
|
/obj/structure/headpike/bamboo/CheckParts(list/parts_list)
|
|
spear = locate(/obj/item/twohanded/bamboospear) in parts_list
|
|
..()
|
|
|
|
/obj/structure/headpike/Initialize()
|
|
. = ..()
|
|
pixel_x = rand(-8, 8)
|
|
|
|
/obj/structure/headpike/update_icon()
|
|
..()
|
|
var/obj/item/bodypart/head/H = locate() in contents
|
|
var/mutable_appearance/MA = new()
|
|
if(H)
|
|
MA.copy_overlays(H)
|
|
MA.pixel_y = 12
|
|
add_overlay(H)
|
|
|
|
/obj/structure/headpike/attack_hand(mob/user)
|
|
. = ..()
|
|
if(.)
|
|
return
|
|
to_chat(user, span_notice("You take down [src]."))
|
|
victim.forceMove(drop_location())
|
|
victim = null
|
|
spear.forceMove(drop_location())
|
|
spear = null
|
|
qdel(src)
|