diff --git a/code/WorkInProgress/Chinsky/ashtray.dm b/code/WorkInProgress/Chinsky/ashtray.dm index 5ec88ac8bd..5825171125 100644 --- a/code/WorkInProgress/Chinsky/ashtray.dm +++ b/code/WorkInProgress/Chinsky/ashtray.dm @@ -32,6 +32,7 @@ var/obj/item/butt = new cig.type_butt(src) cig.transfer_fingerprints_to(butt) del(cig) + W = butt else if (cig.lit == 0) user << "You place [cig] in [src] without even smoking it. Why would you do that?" diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index cfa6483581..f89488e9c4 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -531,10 +531,17 @@ Turf and target are seperate in case you want to teleport some distance from a t . += "*no key*" if(include_name && M) + var/name + if(M.real_name) - . += "/([M.real_name])" + name = M.real_name else if(M.name) - . += "/([M.name])" + name = M.name + + if(is_special_character(M)) + . += "/([name])" //Orange + else + . += "/([name])" return . diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 47903bbc30..23eb17a7be 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -100,8 +100,10 @@ /atom/proc/emp_act(var/severity) return -/atom/proc/bullet_act(var/obj/item/projectile/Proj) - return 0 + +/atom/proc/bullet_act(obj/item/projectile/P, def_zone) + P.on_hit(src, 0, def_zone) + . = 0 /atom/proc/in_contents_of(container)//can take class or object instance as argument if(ispath(container)) @@ -317,7 +319,7 @@ its easier to just keep the beam vertical. var/full_print = md5(H.dna.uni_identity) // Add the fingerprints - // + // if(fingerprints[full_print]) switch(stringpercent(fingerprints[full_print])) //tells us how many stars are in the current prints. @@ -326,7 +328,7 @@ its easier to just keep the beam vertical. fingerprints[full_print] = full_print // You rolled a one buddy. else fingerprints[full_print] = stars(full_print, rand(0,40)) // 24 to 32 - + if(24 to 27) if(prob(3)) fingerprints[full_print] = full_print //Sucks to be you. @@ -353,7 +355,7 @@ its easier to just keep the beam vertical. else fingerprints[full_print] = stars(full_print, rand(0, 20)) //Initial touch, not leaving much evidence the first time. - + return 1 else diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 3747ef9ba6..1f63882eee 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -136,9 +136,15 @@ PT.master = V OT.master = V +<<<<<<< HEAD PT.air_contents.temperature = PHORON_FLASHPOINT PT.air_contents.phoron = 3 PT.air_contents.carbon_dioxide = 17 +======= + PT.air_contents.temperature = PLASMA_FLASHPOINT + PT.air_contents.toxins = 12 + PT.air_contents.carbon_dioxide = 8 +>>>>>>> upstream/master PT.air_contents.update_values() OT.air_contents.temperature = PHORON_FLASHPOINT diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 60de17fef2..319486d6a3 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -123,7 +123,7 @@
Note that for a successful harvest, the body from which the blood was taken from must be dead BEFORE harvesting the pod, however the pod can be growing while they are still alive. Otherwise, the soul would not be able to migrate to the new Diona body.
-
+
It really is that easy! Good luck!