cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Chaplain-

Browse Source 
Cleaned up the bible names a bit
Added the Necronomicon (sprites by Curwen again) to the list of selectable covers
Removed the rest of the Doc Scratch clothes from the chaplains locker

Shaft Miner-
Now starts with the larger, engineering oxy tank

Clothing-
Cueball lost its armour (again), green sparking effect triggers half as often
Spiderman suit is no longer armoured or space worthy

Mapping-
Crayon box added in the chaplains office
Salt and Pepper shakers added in the Kitchen
Prison Station Rec Room now has an arcade and box of crayons
Doc Scratch suit can now spawn randomly in the theatre, with a lesser chance for the cueball to spawn with it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2093 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
kortgstation@gmail.com
2011-09-03 05:55:07 +00:00
parent e6aa3fc0b1
commit 4d55d107cb
10 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/clothing/costume.dm
+16 -13
View File
@@ -44,9 +44,12 @@
new /obj/item/clothing/head/that(src.loc)
del(src)
/obj/landmark/costume/judge/New()
new /obj/item/clothing/suit/judgerobe(src.loc)
new /obj/item/clothing/head/powdered_wig(src.loc)
/obj/landmark/costume/scratch/New()
new /obj/item/clothing/gloves/white(src.loc)
new /obj/item/clothing/shoes/white(src.loc)
new /obj/item/clothing/under/scratch(src.loc)
if (prob(30))
new /obj/item/clothing/head/helmet/cueball(src.loc)
del(src)
/obj/landmark/costume/highlander/New()
@@ -70,16 +73,6 @@
new /obj/item/clothing/head/plaguedoctorhat(src.loc)
del(src)
/obj/landmark/costume/fakewizard/New()
new /obj/item/clothing/suit/wizrobe/fake(src.loc)
new /obj/item/clothing/head/wizard/fake(src.loc)
del(src)
/obj/landmark/costume/marisawizard/New()
new /obj/item/clothing/head/wizard/marisa(src.loc)
new/obj/item/clothing/suit/wizrobe/marisa(src.loc)
del(src)
/obj/landmark/costume/nightowl/New()
new /obj/item/clothing/under/owl(src.loc)
new /obj/item/clothing/mask/owl_mask(src.loc)
@@ -129,6 +122,16 @@
new /obj/item/clothing/mask/spiderman(src.loc)
del(src)
/obj/landmark/costume/marisawizard/New()
new /obj/item/clothing/head/wizard/marisa(src.loc)
new/obj/item/clothing/suit/wizrobe/marisa(src.loc)
del(src)
/obj/landmark/costume/fakewizard/New()
new /obj/item/clothing/suit/wizrobe/fake(src.loc)
new /obj/item/clothing/head/wizard/fake(src.loc)
del(src)
/obj/landmark/costume/hats1/New()
new /obj/item/clothing/head/collectable/petehat(src.loc)
new /obj/item/clothing/head/collectable/metroid(src.loc)
code/defines/obj/clothing/head.dm
-1
View File
@@ -161,7 +161,6 @@
icon_state = "cueball"
flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH
item_state="cueball"
armor = list(melee = 75, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/head/secsoft
name = "Soft Cap"
code/defines/obj/clothing/jumpsuit.dm
+2 -10
View File
@@ -497,19 +497,11 @@
desc = "A classy suit and tie"
/obj/item/clothing/under/spiderman
name = "Spiderman Suit"
desc = "A reinforced suit of Spiderman!"
name = "Deadpool Suit"
desc = "A suit of Deadpool!"
icon_state = "spiderman"
item_state = "spiderman"
color = "spiderman"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
heat_transfer_coefficient = 0.02
radiation_protection = 0.25
protective_temperature = 1000
flags = FPRINT | TABLEPASS | SUITSPACE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
armor = list(melee = 40, bullet = 5, laser = 5, taser = 40, bomb = 5, bio = 0, rad = 0)
/obj/item/clothing/under/rank/nursesuit
desc = "Now THIS is hot."
code/defines/obj/clothing/mask.dm
+2 -3
View File
@@ -31,8 +31,8 @@
permeability_coefficient = 0.10
/obj/item/clothing/mask/spiderman
desc = "A reinforced mask of Spiderman!"
name = "Spiderman mask"
desc = "A mask of Deadpool!"
name = "Deadpool mask"
icon_state = "spiderman"
item_state = "spiderman"
flags = FPRINT|TABLEPASS|SUITSPACE|HEADSPACE|MASKCOVERSMOUTH
@@ -40,7 +40,6 @@
protective_temperature = 420
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
armor = list(melee = 40, bullet = 2, laser = 2, taser = 40, bomb = 0, bio = 50, rad = 0)
/obj/item/clothing/mask/muzzle
name = "muzzle"
code/game/jobs/jobprocs.dm
+9 -4
View File
@@ -154,13 +154,15 @@
if("christianity")
B.name = pick("The Holy Bible","The Dead Sea Scrolls")
if("satanism")
B.name = pick("The Unholy Bible","The Necronomicon")
B.name = "The Unholy Bible"
if("cthulu")
B.name = "The Necronomicon"
if("islam")
B.name = "Quran"
if("scientology")
B.name = pick("The Biography of L. Ron Hubbard","Dianetics")
if("chaos")
B.name = "Space Station 13: The Musical"
B.name = "The Book of Lorgar"
if("imperium")
B.name = "Uplifting Primer"
if("toolboxia")
@@ -195,7 +197,7 @@
while(!accepted)
if(!B) break // prevents possible runtime errors
switch(input(src,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Daederic Scroll", "Creeper", "White Bible", "Holy Light", "Athiest", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts"))
switch(input(src,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Daederic Scroll", "Creeper", "White Bible", "Holy Light", "Athiest", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon"))
if("Koran")
B.icon_state = "koran"
B.item_state = "koran"
@@ -232,6 +234,9 @@
if("the bible melts")
B.icon_state = "melted"
B.icon_state = "melted"
if("Necronomicon")
B.icon_state = "necronomicon"
B.icon_state = "necronomicon"
else
// if christian bible, revert to default
B.icon_state = "bible"
@@ -321,7 +326,7 @@
if ("Shaft Miner")
src.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/engineer(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/device/radio/headset/headset_mine (src), slot_ears)
src.equip_if_possible(new /obj/item/clothing/under/rank/miner(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
code/game/objects/closets/wardrobe.dm
-3
View File
@@ -69,9 +69,6 @@
new /obj/item/clothing/suit/chaplain_hoodie( src )
new /obj/item/clothing/head/chaplain_hood( src )
new /obj/item/clothing/suit/holidaypriest( src )
new /obj/item/clothing/under/scratch( src )
new /obj/item/clothing/shoes/white( src )
new /obj/item/clothing/gloves/white( src )
new /obj/item/weapon/candlepack( src )
new /obj/item/weapon/candlepack( src )
return