cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

space syndicate derelict loot changes (#20083)

Browse Source 
* replaces e swords with ultra secure c20s and magazines

* one e sword
This commit is contained in:
Marmio64
2023-08-29 13:59:35 -05:00
committed by GitHub
parent 36eea69955
commit 1dad2dd66b
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
_maps/RandomRuins/SpaceRuins/syndicate_derelict_station.dmm
View File

@@ -229,6 +229,17 @@
/obj/machinery/hydroponics/constructable,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/syndiederelict/hydroponics)
"ec" = (
/obj/machinery/airalarm/syndicate{
dir = 8;
pixel_x = 24
},
/obj/structure/closet/crate/secure/gear,
/obj/item/gun/ballistic/automatic/c20r/ultrasecure,
/obj/item/ammo_box/magazine/smgm45,
/obj/item/melee/transforming/energy/sword,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/syndiederelict/virology)
"eE" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -306,7 +317,7 @@
},
/obj/machinery/power/apc/syndicate{
name = "Syndicate Derelict Kitchen";
pixel_y = -24;
pixel_y = -23;
start_charge = 0
},
/obj/machinery/light/broken,
@@ -501,10 +512,10 @@
tilted = 1
},
/obj/machinery/power/apc/syndicate{
name = "Syndicate Derelict Hydroponics";
dir = 1;
start_charge = 0;
pixel_y = 24
name = "Syndicate Derelict Hydroponics";
pixel_y = 23;
start_charge = 0
},
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -551,7 +562,7 @@
},
/obj/machinery/power/apc/syndicate{
name = "Syndicate Derelict Hallway";
pixel_y = -24;
pixel_y = -23;
start_charge = 0
},
/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
@@ -1109,9 +1120,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc/syndicate{
name = "Syndicate Derelict Engineering";
pixel_x = -24;
dir = 8;
name = "Syndicate Derelict Engineering";
pixel_x = -25;
start_charge = 0
},
/obj/effect/mob_spawn/human/syndicate_derelict_engineer{
@@ -2031,9 +2042,9 @@
/obj/item/shard,
/obj/effect/decal/cleanable/blood,
/obj/machinery/power/apc/syndicate{
name = "Syndicate Derelict Research Wing";
pixel_x = -24;
dir = 8;
name = "Syndicate Derelict Research Wing";
pixel_x = -25;
start_charge = 0
},
/turf/open/floor/plating/broken/three,
@@ -2287,9 +2298,9 @@
dir = 5
},
/obj/machinery/power/apc/syndicate{
name = "Syndicate Derelict Virology";
pixel_x = -24;
dir = 8;
name = "Syndicate Derelict Virology";
pixel_x = -25;
start_charge = 0
},
/obj/effect/decal/cleanable/blood/footprints,
@@ -2507,7 +2518,7 @@
"Xg" = (
/obj/machinery/power/apc/syndicate{
name = "Syndicate Derelict Medbay";
pixel_y = -24;
pixel_y = -23;
start_charge = 0
},
/obj/structure/cable/yellow{
@@ -2534,16 +2545,6 @@
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plasteel/airless/broken/three,
/area/ruin/space/has_grav/syndiederelict/research)
"XA" = (
/obj/machinery/airalarm/syndicate{
dir = 8;
pixel_x = 24
},
/obj/structure/closet/crate/secure/gear,
/obj/item/melee/transforming/energy/sword,
/obj/item/melee/transforming/energy/sword,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/syndiederelict/virology)
"XC" = (
/obj/structure/lattice,
/obj/structure/grille/broken,
@@ -3028,7 +3029,7 @@ QU
xQ
Ya
Wm
XA
ec
UL
Yf
Yf

1
code/game/objects/structures/ghost_role_spawners.dm
View File

@@ -830,3 +830,4 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
id = /obj/item/card/id/syndicate
l_pocket = /obj/item/flashlight
r_pocket = /obj/item/kitchen/knife/combat/survival
implants = list(/obj/item/implant/weapons_auth)

3
code/modules/projectiles/guns/ballistic/automatic.dm
View File

@@ -78,6 +78,9 @@
mag_display_ammo = TRUE
empty_indicator = TRUE
/obj/item/gun/ballistic/automatic/c20r/ultrasecure
pin = /obj/item/firing_pin/fucked
/obj/item/gun/ballistic/automatic/c20r/unrestricted
pin = /obj/item/firing_pin