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

Batch pr pull (#12554)

Browse Source 
* https://github.com/tgstation/tgstation/pull/65814

* https://github.com/tgstation/tgstation/pull/65832

* https://github.com/tgstation/tgstation/pull/65850

* https://github.com/tgstation/tgstation/pull/65689

* https://github.com/tgstation/tgstation/pull/65579

* https://github.com/tgstation/tgstation/pull/65760
This commit is contained in:
Gandalf
2022-04-06 19:26:58 +01:00
committed by GitHub
parent 9917ff2643
commit ad0b6e4e67
51 changed files with 485 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+3 -3
View File
@@ -130,7 +130,7 @@
/obj/item/clothing/shoes/jackboots = 3,
/obj/item/clothing/head/beret/sec = 3,
/obj/item/clothing/head/soft/sec = 3,
/obj/item/clothing/mask/bandana/red = 2)
/obj/item/clothing/mask/bandana/color/red = 2)
generate_items_inside(items_inside,src)
return
@@ -217,9 +217,9 @@
/obj/item/clothing/head/soft/black = 2)
generate_items_inside(items_inside,src)
if(prob(40))
new /obj/item/clothing/mask/bandana/skull(src)
new /obj/item/clothing/mask/bandana/color/skull/black(src)
if(prob(40))
new /obj/item/clothing/mask/bandana/skull(src)
new /obj/item/clothing/mask/bandana/color/skull/black(src)
return
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+12 -12
View File
@@ -45,10 +45,10 @@
new /obj/item/clothing/head/that(src)
for(var/i in 1 to 3)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/mask/bandana/black(src)
new /obj/item/clothing/mask/bandana/black(src)
new /obj/item/clothing/mask/bandana/color/black(src)
new /obj/item/clothing/mask/bandana/color/black(src)
if(prob(40))
new /obj/item/clothing/mask/bandana/skull(src)
new /obj/item/clothing/mask/bandana/color/skull/black(src)
return
@@ -63,8 +63,8 @@
new /obj/item/clothing/under/color/jumpskirt/green(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/mask/bandana/green(src)
new /obj/item/clothing/mask/bandana/green(src)
new /obj/item/clothing/mask/bandana/color/green(src)
new /obj/item/clothing/mask/bandana/color/green(src)
return
@@ -94,8 +94,8 @@
new /obj/item/clothing/under/color/jumpskirt/yellow(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/orange(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/color/gold(src)
new /obj/item/clothing/mask/bandana/color/gold(src)
return
@@ -144,8 +144,8 @@
if(prob(50))
new /obj/item/storage/backpack/duffelbag(src)
if(prob(40))
new /obj/item/clothing/mask/bandana/black(src)
new /obj/item/clothing/mask/bandana/black(src)
new /obj/item/clothing/mask/bandana/color/black(src)
new /obj/item/clothing/mask/bandana/color/black(src)
if(prob(40))
new /obj/item/clothing/under/misc/assistantformal(src)
if(prob(40))
@@ -185,9 +185,9 @@
new /obj/item/clothing/under/color/jumpskirt/teal(src)
new /obj/item/clothing/under/color/lightpurple(src)
new /obj/item/clothing/under/color/jumpskirt/lightpurple(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/blue(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/color/red(src)
new /obj/item/clothing/mask/bandana/color/blue(src)
new /obj/item/clothing/mask/bandana/color/gold(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/shoes/sneakers/white(src)