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

Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

Browse Source
This commit is contained in:
Waterpig
2024-09-08 00:59:39 +02:00
parent 410024afef 4b4ae0958f
commit 4c4930c71d
1728 changed files with 273718 additions and 2237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/UpdatePaths/Scripts/60619_toxins_to_plasma.txt
+4
View File
@@ -31,7 +31,11 @@
/obj/machinery/atmospherics/miner/toxins : /obj/machinery/atmospherics/miner/plasma
/obj/item/storage/backpack/satchel/tox : /obj/item/storage/backpack/satchel/science
<<<<<<< HEAD
/obj/item/computer_hardware/hard_drive/role/signal/toxins : /obj/item/computer_hardware/hard_drive/role/signal/ordnance
=======
/obj/item/cartridge/signal/toxins : /obj/item/cartridge/signal/ordnance
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
/obj/item/pda/toxins : /obj/item/pda/science
/obj/item/book/manual/wiki/toxins : /obj/item/book/manual/wiki/ordnance
/obj/item/storage/backpack/duffelbag/toxins : /obj/item/storage/backpack/duffelbag/science
tools/UpdatePaths/Scripts/62789_camera_diag_f2w.txt
+8
View File
@@ -1,4 +1,12 @@
<<<<<<< HEAD
/obj/machinery/camera/@SUBTYPES {dir=5} : @OLD {@OLD;dir=10}
/obj/machinery/camera/@SUBTYPES {dir=10} : @OLD {@OLD;dir=5}
/obj/machinery/camera/@SUBTYPES {dir=6} : @OLD {@OLD;dir=9}
/obj/machinery/camera/@SUBTYPES {dir=9} : @OLD {@OLD;dir=6}
=======
/obj/machinery/camera/@SUBTYPES {dir=5;conversion_done=@UNSET} : @OLD {@OLD;dir=10;conversion_done=1}
/obj/machinery/camera/@SUBTYPES {dir=10;conversion_done=@UNSET} : @OLD {@OLD;dir=5;conversion_done=1}
/obj/machinery/camera/@SUBTYPES {dir=6;conversion_done=@UNSET} : @OLD {@OLD;dir=9;conversion_done=1}
/obj/machinery/camera/@SUBTYPES {dir=9;conversion_done=@UNSET} : @OLD {@OLD;dir=6;conversion_done=1}
/obj/machinery/camera/@SUBTYPES {conversion_done=1} : @OLD {@OLD;conversion_done=@SKIP}
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt
+5
View File
@@ -145,8 +145,13 @@
/obj/item/clothing/under/rank/chief_medical_officer : /obj/item/clothing/under/rank/medical/chief_medical_officer
/obj/item/clothing/under/rank/chief_medical_officer/skirt : /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
/obj/item/clothing/under/rank/medical/doctor/blue : /obj/item/clothing/under/rank/medical/scrubs/blue
<<<<<<< HEAD
/obj/item/clothing/under/rank/medical/doctor/green : /obj/item/clothing/under/rank/medical/scrubs/green
/obj/item/clothing/under/rank/medical/doctor/purple : /obj/item/clothing/under/rank/medical/scrubs/purple
=======
/obj/item/clothing/under/rank/medical/doctor/blue : /obj/item/clothing/under/rank/medical/scrubs/green
/obj/item/clothing/under/rank/medical/doctor/blue : /obj/item/clothing/under/rank/medical/scrubs/purple
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
/obj/item/clothing/under/rank/geneticist : /obj/item/clothing/under/rank/rnd/geneticist
/obj/item/clothing/under/rank/geneticist/skirt : /obj/item/clothing/under/rank/rnd/geneticist/skirt
/obj/item/clothing/under/rank/virologist : /obj/item/clothing/under/rank/medical/virologist
tools/UpdatePaths/Scripts/69081_drinks_refactor.txt
+5 -1
View File
@@ -22,4 +22,8 @@
/obj/item/reagent_containers/cup/glass/bottle/cream : /obj/item/reagent_containers/cup/glass/bottle/juice/cream {@OLD}
/obj/item/reagent_containers/cup/glass/bottle/limejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice {@OLD}
/obj/item/reagent_containers/cup/glass/bottle/pineapplejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice {@OLD}
/obj/item/reagent_containers/cup/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD}
<<<<<<< HEAD
/obj/item/reagent_containers/cup/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD}
=======
/obj/item/reagent_containers/cup/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD}
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
tools/UpdatePaths/Scripts/85759_waffle_trash_begone.txt
+1
View File
@@ -0,0 +1 @@
/obj/item/trash/waffles : @DELETE