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

TG sync Sunday (#201)

Browse Source 
* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping
This commit is contained in:
Poojawa
2017-02-06 00:36:56 -06:00
committed by GitHub
parent aeeca195c7
commit 73b6b33f79
279 changed files with 3548 additions and 2585 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/explosives.dm
+2 -2
View File
@@ -97,11 +97,11 @@
addtimer(CALLBACK(src, .proc/explode), timer * 10)
/obj/item/weapon/c4/proc/explode()
if(qdeleted(src))
if(QDELETED(src))
return
var/turf/location
if(target)
if(!qdeleted(target))
if(!QDELETED(target))
location = get_turf(target)
target.overlays -= image_overlay
target.priority_overlays -= image_overlay
code/game/objects/items/weapons/grenades/chem_grenade.dm
+19
View File
@@ -381,6 +381,25 @@
beakers += B2
/obj/item/weapon/grenade/chem_grenade/ez_clean
name = "cleaner grenade"
desc = "Waffle Co.-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
stage = READY
/obj/item/weapon/grenade/chem_grenade/ez_clean/New()
..()
var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
B1.reagents.add_reagent("fluorosurfactant", 40)
B2.reagents.add_reagent("water", 40)
B2.reagents.add_reagent("ez_clean", 60) //ensures a t h i c c distribution
beakers += B1
beakers += B2
/obj/item/weapon/grenade/chem_grenade/teargas
name = "teargas grenade"
desc = "Used for nonlethal riot control. Contents under pressure. Do not directly inhale contents."
code/game/objects/items/weapons/grenades/clusterbuster.dm
+1 -1
View File
@@ -64,7 +64,7 @@
walk_away(P,loc,rand(1,4))
spawn(rand(15,60))
if(P && !qdeleted(P))
if(P && !QDELETED(P))
P.prime()
qdel(src)
code/game/objects/items/weapons/grenades/grenade.dm
+1 -1
View File
@@ -19,7 +19,7 @@
/obj/item/weapon/grenade/deconstruct(disassembled = TRUE)
if(!disassembled)
prime()
if(!qdeleted(src))
if(!QDELETED(src))
qdel(src)
/obj/item/weapon/grenade/proc/clown_check(mob/living/carbon/human/user)
code/game/objects/items/weapons/grenades/plastic.dm
+2 -2
View File
@@ -128,7 +128,7 @@
/obj/item/weapon/grenade/plastic/c4/prime()
var/turf/location
if(target)
if(!qdeleted(target))
if(!QDELETED(target))
location = get_turf(target)
target.overlays -= image_overlay
target.priority_overlays -= image_overlay
@@ -156,7 +156,7 @@
/obj/item/weapon/grenade/plastic/x4/prime()
var/turf/location
if(target)
if(!qdeleted(target))
if(!QDELETED(target))
location = get_turf(target)
target.overlays -= image_overlay
target.priority_overlays -= image_overlay
code/game/objects/items/weapons/implants/implant_chem.dm
+1 -1
View File
@@ -27,7 +27,7 @@
tracked_chem_implants += src
/obj/item/weapon/implant/chem/Destroy()
..()
. = ..()
tracked_chem_implants -= src
code/game/objects/items/weapons/implants/implant_track.dm
+1 -1
View File
@@ -10,7 +10,7 @@
tracked_implants += src
/obj/item/weapon/implant/tracking/Destroy()
..()
. = ..()
tracked_implants -= src
/obj/item/weapon/implanter/tracking/New()
code/game/objects/items/weapons/melee/misc.dm
+2 -2
View File
@@ -144,8 +144,8 @@
playsound(loc, 'sound/weapons/batonextend.ogg', 50, 1)
add_fingerprint(user)
sleep(3)
if (H && !qdeleted(H))
if (B && !qdeleted(B))
if (H && !QDELETED(H))
if (B && !QDELETED(B))
H.internal_organs -= B
qdel(B)
new /obj/effect/gibspawner/generic(H.loc, H.viruses, H.dna)
code/game/objects/items/weapons/scrolls.dm
+1 -1
View File
@@ -51,7 +51,7 @@
var/A
A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in teleportlocs
if(!src || qdeleted(src) || !user || !user.is_holding(src) || user.incapacitated() || !A || !uses)
if(!src || QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated() || !A || !uses)
return
var/area/thearea = teleportlocs[A]
code/game/objects/items/weapons/storage/backpack.dm
-7
View File
@@ -273,13 +273,6 @@
level = 1
cant_hold = list(/obj/item/weapon/storage/backpack/satchel/flat) //muh recursive backpacks
/obj/item/weapon/storage/backpack/satchel/duty
name = "duty satchel"
desc = "An extra trendy looking satchel."
icon_state = "satchel-duty"
/obj/item/weapon/storage/backpack/satchel/flat/hide(var/intact)
if(intact)
invisibility = INVISIBILITY_MAXIMUM
code/game/objects/items/weapons/storage/book.dm
+1 -6
View File
@@ -56,7 +56,6 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible",
if(B.icon_state == "honk1" || B.icon_state == "honk2")
var/mob/living/carbon/human/H = usr
new /obj/item/weapon/bikehorn(B)
H.dna.add_mutation(CLOWNMUT)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask)
@@ -157,8 +156,4 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible",
/obj/item/weapon/storage/book/bible/booze/New()
..()
new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
new /obj/item/stack/spacecash(src)
new /obj/item/stack/spacecash(src)
new /obj/item/stack/spacecash(src)
new /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey(src)
code/game/objects/items/weapons/storage/uplink_kits.dm
+5
View File
@@ -301,3 +301,8 @@
new /obj/item/weapon/reagent_containers/glass/bottle/romerol(src)
new /obj/item/weapon/reagent_containers/syringe(src)
new /obj/item/weapon/reagent_containers/dropper(src)
/obj/item/weapon/storage/box/syndie_kit/ez_clean/New()
..()
for(var/i in 1 to 3)
new/obj/item/weapon/grenade/chem_grenade/ez_clean(src)
code/game/objects/items/weapons/tanks/tanks.dm
+1 -1
View File
@@ -116,7 +116,7 @@
var/mob/living/carbon/human/H = user
user.visible_message("<span class='suicide'>[user] is putting [src]'s valve to [user.p_their()] lips! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3)
if (H && !qdeleted(H))
if (H && !QDELETED(H))
for(var/obj/item/W in H)
H.dropItemToGround(W)
if(prob(50))
code/game/objects/items/weapons/twohanded.dm
+4 -4
View File
@@ -136,7 +136,7 @@
var/obj/item/weapon/twohanded/O = user.get_inactive_held_item()
if (istype(O) && !istype(O, /obj/item/weapon/twohanded/offhand/)) //If you have a proper item in your other hand that the offhand is for, do nothing. This should never happen.
return
if (qdeleted(src))
if (QDELETED(src))
return
qdel(src) //If it's another offhand, or literally anything else, qdel. If I knew how to add logging messages I'd put one here.
@@ -169,8 +169,8 @@
..()
var/slotbit = slotdefine2slotbit(slot)
if(slot_flags & slotbit)
var/O = user.is_holding_item_of_type(/obj/item/weapon/twohanded/offhand)
if(!O || qdeleted(O))
var/datum/O = user.is_holding_item_of_type(/obj/item/weapon/twohanded/offhand)
if(!O || QDELETED(O))
return
qdel(O)
return
@@ -700,7 +700,7 @@
if(source.z == ZLEVEL_STATION && get_dist(turfhit, source) < maxdist || source.z != ZLEVEL_STATION)
..()
if(do_after_mob(user, src, 5, uninterruptible = 1, progress = 0))
if(qdeleted(src))
if(QDELETED(src))
return
var/turf/landing = get_turf(src)
if (loc != landing)