shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-37582

Browse Source
This commit is contained in:
LetterJay
2018-05-22 07:22:42 -05:00
committed by GitHub
parent e57cf81636 b3e5513185
commit 5f27ac30c7
302 changed files with 2217 additions and 1980 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/rdconsole.dm
+1 -1
View File
@@ -193,7 +193,7 @@ doesn't have toxins access.
/obj/machinery/computer/rdconsole/emag_act(mob/user)
if(!(obj_flags & EMAGGED))
to_chat(user, "<span class='notice'>You disable the security protocols[locked? " and unlock the console.":""].</span>")
to_chat(user, "<span class='notice'>You disable the security protocols[locked? " and unlock the console":""].</span>")
playsound(src, "sparks", 75, 1)
obj_flags |= EMAGGED
locked = FALSE
code/modules/research/xenobiology/crossbreeding/burning.dm
+1 -1
View File
@@ -386,7 +386,7 @@ Burning extracts:
item_state = "adamshield"
w_class = WEIGHT_CLASS_HUGE
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
slot_flags = SLOT_BACK
slot_flags = ITEM_SLOT_BACK
block_chance = 75
throw_range = 1 //How far do you think you're gonna throw a solid crystalline shield...?
throw_speed = 2
code/modules/research/xenobiology/crossbreeding/charged.dm
+5 -3
View File
@@ -324,7 +324,7 @@ Charged extracts:
if(!istype(C))
to_chat(user, "<span class='warning'>The potion can only be used on clothing!</span>")
return
if(C.min_cold_protection_temperature == SPACE_SUIT_MIN_TEMP_PROTECT && C.flags_1 & STOPSPRESSUREDMAGE_1)
if(C.min_cold_protection_temperature == SPACE_SUIT_MIN_TEMP_PROTECT && C.clothing_flags & STOPSPRESSUREDAMAGE)
to_chat(user, "<span class='warning'>The [C] is already pressure-resistant!</span>")
return ..()
to_chat(user, "<span class='notice'>You slather the blue gunk over the [C], making it airtight.</span>")
@@ -333,7 +333,7 @@ Charged extracts:
C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY)
C.min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
C.cold_protection = C.body_parts_covered
C.flags_1 |= STOPSPRESSUREDMAGE_1
C.clothing_flags |= STOPSPRESSUREDAMAGE
uses--
if(!uses)
qdel(src)
@@ -366,7 +366,9 @@ Charged extracts:
C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
C.add_atom_colour("#800000", FIXED_COLOUR_PRIORITY)
C.resistance_flags |= LAVA_PROOF
C.flags_2 |= LAVA_PROTECT_2
if (istype(C, /obj/item/clothing))
var/obj/item/clothing/CL = C
CL.clothing_flags |= LAVAPROTECT
uses--
if(!uses)
qdel(src)
code/modules/research/xenobiology/crossbreeding/regenerative.dm
+8 -8
View File
@@ -89,10 +89,10 @@ Regenerative extracts:
/obj/item/slimecross/regenerative/darkpurple/core_effect(mob/living/target, mob/user)
var/equipped = 0
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/purple(null), slot_shoes)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(null), slot_w_uniform)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/purple(null), slot_gloves)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/head/soft/purple(null), slot_head)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/purple(null), SLOT_SHOES)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(null), SLOT_W_UNIFORM)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/purple(null), SLOT_GLOVES)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/head/soft/purple(null), SLOT_HEAD)
if(equipped > 0)
target.visible_message("<span class='notice'>The milky goo congeals into clothing!</span>")
@@ -104,13 +104,13 @@ Regenerative extracts:
return
var/mob/living/carbon/human/H = target
var/fireproofed = FALSE
if(H.get_item_by_slot(slot_wear_suit))
if(H.get_item_by_slot(SLOT_WEAR_SUIT))
fireproofed = TRUE
var/obj/item/clothing/C = H.get_item_by_slot(slot_wear_suit)
var/obj/item/clothing/C = H.get_item_by_slot(SLOT_WEAR_SUIT)
fireproof(C)
if(H.get_item_by_slot(slot_head))
if(H.get_item_by_slot(SLOT_HEAD))
fireproofed = TRUE
var/obj/item/clothing/C = H.get_item_by_slot(slot_head)
var/obj/item/clothing/C = H.get_item_by_slot(SLOT_HEAD)
fireproof(C)
if(fireproofed)
target.visible_message("<span class='notice'>Some of [target]'s clothing gets coated in the goo, and turns blue!</span>")