cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 03:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

The last one hopefully

Browse Source
This commit is contained in:
VerySoft
2022-04-01 12:44:05 -04:00
parent e011b05110
commit ffb06bb3c8
7 changed files with 2926 additions and 1718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
+1 -1
View File
@@ -531,7 +531,7 @@
makes_dirt = 0 makes_dirt = 0
say_list_type = /datum/say_list/catslug/gatslug say_list_type = /datum/say_list/catslug/gatslug
melee_damage_upper = 10 //"Trained" security member, so they can hit that little bit harder melee_damage_upper = 10 //"Trained" security member, so they can hit that little bit harder
list/armor = list( armor = list(
"melee" = 15, "melee" = 15,
"bullet" = 0, "bullet" = 0,
"laser" = 0, "laser" = 0,
maps/groundbase/gb-centcomm.dmm
-1
View File
@@ -22,7 +22,6 @@
door_color = "#822a1e"; door_color = "#822a1e";
frequency = 1380; frequency = 1380;
id_tag = "escape_shuttle_hatch"; id_tag = "escape_shuttle_hatch";
locked = 1;
name = "Docking Port Airlock" name = "Docking Port Airlock"
}, },
/obj/effect/shuttle_landmark{ /obj/effect/shuttle_landmark{
maps/groundbase/gb-z1.dmm
+548 -75
View File
File diff suppressed because it is too large Load Diff
maps/groundbase/gb-z2.dmm
+1618 -916
View File
File diff suppressed because it is too large Load Diff
maps/groundbase/gb-z3.dmm
+755 -723
View File
File diff suppressed because it is too large Load Diff
maps/groundbase/groundbase_areas.dm
+2
View File
@@ -269,6 +269,8 @@
name = "Pilot Equipment Room" name = "Pilot Equipment Room"
/area/groundbase/civilian/gateway /area/groundbase/civilian/gateway
name = "Gateway" name = "Gateway"
/area/groundbase/civilian/janitor
name = "Janitor's Closet"
/area/groundbase/exploration /area/groundbase/exploration
name = "Exploration" name = "Exploration"
maps/groundbase/groundbase_defines.dm
+2 -2
View File
@@ -444,7 +444,7 @@
/obj/effect/step_trigger/teleporter/to_mining/Initialize() /obj/effect/step_trigger/teleporter/to_mining/Initialize()
. = ..() . = ..()
teleport_x = x teleport_x = x
teleport_y = y + 1 teleport_y = y ++
teleport_z = Z_LEVEL_MINING teleport_z = Z_LEVEL_MINING
/obj/effect/step_trigger/teleporter/from_mining /obj/effect/step_trigger/teleporter/from_mining
@@ -454,5 +454,5 @@
/obj/effect/step_trigger/teleporter/from_mining/Initialize() /obj/effect/step_trigger/teleporter/from_mining/Initialize()
. = ..() . = ..()
teleport_x = x teleport_x = x
teleport_y = y - 1 teleport_y = y --
teleport_z = Z_LEVEL_GB_BOTTOM teleport_z = Z_LEVEL_GB_BOTTOM