cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
This commit is contained in:
Iamgoofball
2015-03-08 14:26:52 -07:00
parent 15bc4760a7 19bd410915
commit e6f257d413
285 changed files with 9871 additions and 13276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/Cleanable/humans.dm
+1 -1
View File
@@ -37,7 +37,7 @@
/obj/effect/decal/cleanable/trail_holder //not a child of blood on purpose
name = "blood"
icon_state = "blank"
icon_state = "ltrails_1"
desc = "Your instincts say you shouldn't be following these."
gender = PLURAL
density = 0
code/game/objects/effects/decals/contraband.dm
+8 -2
View File
@@ -1,9 +1,9 @@
//########################## CONTRABAND ;3333333333333333333 -Agouri ###################################################
#define NUM_OF_POSTER_DESIGNS 32 //subtype 0-contraband posters
#define NUM_OF_POSTER_DESIGNS 33 //subtype 0-contraband posters
#define NUM_OF_POSTER_DESIGNS_LEGIT 32 //subtype 1-corporate approved posters
#define NUM_OF_POSTER_DESIGNS_LEGIT 33 //subtype 1-corporate approved posters
/obj/item/weapon/contraband
name = "contraband item"
@@ -188,6 +188,9 @@ obj/structure/sign/poster/New(serial,subtype)
if(32)
name += " - Punch Shit"
desc += " Fight things for no reason, like a man!"
if(33)
name += " - The Griffin"
desc += " The Griffin commands you to be the worst you can be. Will you?"
else
name += " - Error (subtype 0 serial_number)"
desc += " This is a bug, please report the circumstances under which you encountered this poster at https://github.com/tgstation/-tg-station/issues."
@@ -291,6 +294,9 @@ obj/structure/sign/poster/New(serial,subtype)
if(32)
name += " - High-Class Martini"
desc += " I told you to shake it, no stirring"
if(33)
name += " - The Owl"
desc += " The Owl would do his best to protect the station. Will you?"
else
name += " - Error (subtype 1 serial_number)"
desc += " This is a bug, please report the circumstances under which you encountered this poster at https://github.com/NTStation/NTstation13/issues."
code/game/objects/effects/effect_system/effects_other.dm
+1 -1
View File
@@ -32,7 +32,7 @@
var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition)
I.dir = src.holder.dir
flick("ion_fade", I)
I.icon_state = "blank"
I.icon_state = "ion_trails"
spawn( 20 )
if(I)
I.delete()
code/game/objects/effects/landmarks.dm
+9
View File
@@ -84,6 +84,7 @@
..()
tag = "start*[name]"
invisibility = 101
start_landmarks_list += src
return 1
@@ -164,10 +165,18 @@
qdel(src)
/obj/effect/landmark/costume/nightowl/New()
new /obj/item/clothing/suit/toggle/owlwings(src.loc)
new /obj/item/clothing/under/owl(src.loc)
new /obj/item/clothing/mask/gas/owl_mask(src.loc)
qdel(src)
/obj/effect/landmark/costume/thegriffin/New()
new /obj/item/clothing/suit/toggle/owlwings/griffinwings(src.loc)
new /obj/item/clothing/shoes/griffin(src.loc)
new /obj/item/clothing/under/griffin(src.loc)
new /obj/item/clothing/head/griffin(src.loc)
qdel(src)
/obj/effect/landmark/costume/waiter/New()
new /obj/item/clothing/under/waiter(src.loc)
var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)