cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-20 19:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

Browse Source 
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
This commit is contained in:
Leshana
2018-02-23 20:32:44 -05:00
parent 4457c2ffd2 63667c4a02
commit 30454ccdc3
138 changed files with 2790 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/firstaid.dm
+3 -3
View File
@@ -132,7 +132,7 @@
/obj/item/weapon/surgical/FixOVein,
/obj/item/stack/medical/advanced/bruise_pack,
/obj/item/stack/nanopaste
///obj/item/device/healthanalyzer/enhanced //VOREStation Removal
// /obj/item/device/healthanalyzer/advanced //VOREStation Removal
)
starts_with = list(
@@ -145,8 +145,8 @@
/obj/item/weapon/surgical/surgicaldrill,
/obj/item/weapon/surgical/bonegel,
/obj/item/weapon/surgical/FixOVein,
/obj/item/stack/medical/advanced/bruise_pack
///obj/item/device/healthanalyzer/enhanced //VOREStation Removal
/obj/item/stack/medical/advanced/bruise_pack,
///obj/item/device/healthanalyzer/advanced //VOREStation Removal
)
/obj/item/weapon/storage/firstaid/clotting