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

Merge remote-tracking branch 'upstream/master' into TFF-Xenobio_Monkeying_Around

Browse Source
This commit is contained in:
TheFurryFeline
2019-11-25 18:08:37 -05:00
parent c6c6a70d53 0e30084e78
commit ada784b2cd
8 changed files with 2408 additions and 2403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space Station 13 areas_vr.dm
+10
View File
@@ -248,3 +248,13 @@
/area/engineering/engine_gas
name = "\improper Engine Gas Storage"
icon_state = "engine_waste"
//CHOMPStation Addition Start - TFF 24/11/19 - New areas for Chapel Maint.
/area/maintenance/chapel_aft
name = "Chapel Maintenance - Aft"
icon_state = "maint_chapel"
/area/maintenance/chapel_fore
name = "Chapel Maintenance - Fore"
icon_state = "maint_chapel"
//CHOMPStation Addition End
code/modules/events/boss.dm
+4 -4
View File
@@ -2,7 +2,7 @@
#define LOC_CHAPEL 1
#define LOC_LIBRARY 2
#define LOC_GARDEN 3
#define LOC_MAINTENANCE 4
#define LOC_MAINTENANCE 4
#define LOC_CONSTR 5
#define BOSS_METROID 0
@@ -42,7 +42,7 @@
spawn_area_type = /area/hydroponics/garden
locstring = "the public garden"
if(LOC_MAINTENANCE)
spawn_area_type = /area/maintenance/locker
spawn_area_type = /area/maintenance/chapel_fore
locstring = "far northern maintenance tunnels"
if(LOC_CONSTR)
spawn_area_type = /area/construction
@@ -102,7 +102,7 @@
#undef LOC_CHAPEL
#undef LOC_LIBRARY
#undef LOC_GARDEN
#undef LOC_MAINTENANCE
#undef LOC_MAINTENANCE
#undef LOC_CONSTR
#undef BOSS_METROID
@@ -113,4 +113,4 @@
#undef BOSS_DRAGON
#undef BOSS_PANTHER
#undef BOSS_MOTHER
#undef BOSS_CHUNGUS
#undef BOSS_CHUNGUS
code/modules/reagents/Chemistry-Recipes.dm
+2388 -2388
View File
File diff suppressed because it is too large Load Diff
code/modules/reagents/Chemistry-Recipes_vr.dm
+1 -1
View File
@@ -134,7 +134,7 @@
name = "Bullvalene"
id = "bullvalene"
result = "bullvalene"
required_reagents = list("dermaline" = 1, "orangesap" = 1, "Copper" = 1)
required_reagents = list("dermaline" = 1, "orangesap" = 1, "copper" = 1)
result_amount = 1
/datum/chemical_reaction/nutrient
code/modules/vore/eating/living_vr.dm
+2 -2
View File
@@ -228,12 +228,12 @@
digestable = P.digestable
//TFF 30/4/19: Ports VoreStation Remains Option
P.digest_leave_remains = src.digest_leave_remains
digest_leave_remains = P.digest_leave_remains
allowmobvore = P.allowmobvore
vore_taste = P.vore_taste
can_be_drop_prey = P.can_be_drop_prey
can_be_drop_pred = P.can_be_drop_pred
P.inflatable = src.inflatable
inflatable = P.inflatable
release_vore_contents(silent = TRUE)
vore_organs.Cut()
maps/northern_star/northern_star_areas.dm
-8
View File
@@ -26,14 +26,6 @@
name = "Mining Outpost Emergency Storage"
//TFF 28/9/19 - Add more areas. Again.
/area/maintenance/chapel_aft
name = "Chapel Maintenance - Aft"
icon_state = "maint_chapel"
/area/maintenance/chapel_fore
name = "Chapel Maintenance - Fore"
icon_state = "maint_chapel"
/area/crew_quarters/bar_backroom
name = "Bar Backroom"
icon_state = "bar"
maps/northern_star/polaris-1.dmm
+1
View File
@@ -7372,6 +7372,7 @@
"cLN" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/weapon/soap,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
"cLO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
"cLP" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
"cLQ" = (/obj/machinery/door/airlock/glass_medical{name = "First-Aid Station"; req_one_access = newlist()},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station)
"cLR" = (/obj/machinery/light/small,/obj/machinery/recharge_station,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
"cLS" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_3)
"cLT" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_9)
maps/northern_star/polaris-5.dmm
+2
View File
@@ -567,6 +567,7 @@
"kU" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/medical)
"kV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/sleep_console,/turf/simulated/floor/tiled/white,/area/outpost/research/medical)
"kW" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/outpost/research/medical)
"kX" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass_medical{req_access = newlist(); req_one_access = newlist()},/turf/simulated/floor/tiled/white,/area/outpost/research/medical)
"kY" = (/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock)
"kZ" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock)
"la" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock)
@@ -622,6 +623,7 @@
"lY" = (/obj/machinery/conveyor{dir = 4; id = "anolongstorage"},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/outpost/research/tempstorage)
"lZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/medical)
"ma" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/medical)
"mb" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_medical{name = "Medbay"; req_access = newlist(); req_one_access = newlist()},/turf/simulated/floor/tiled/white,/area/outpost/research/medical)
"mc" = (/obj/structure/sign/greencross,/turf/simulated/wall/r_wall,/area/outpost/research/medical)
"md" = (/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/dock)
"me" = (/obj/effect/floor_decal/corner/purple,/turf/simulated/floor/tiled/white,/area/outpost/research/dock)