shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from sheepishgoat/maps-we-got-them

Browse Source 
Maps we got them
This commit is contained in:
evilew
2024-10-09 19:41:48 +02:00
committed by GitHub
parent d20bf9ff41 897cc87fa3
commit e9726a607b
88 changed files with 934435 additions and 132780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/clothing/cloaks.dm
+8
View File
@@ -0,0 +1,8 @@
/obj/item/clothing/neck/cloak/centcom
name = "central command's cloak"
desc = "Worn by High-Ranking Central Command Personnel. I guess they needed one too."
icon = 'GainStation13/icons/obj/clothing/cloaks.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/neck.dmi'
icon_state = "centcomcloak"
armor = list("melee" = 35, "bullet" = 40, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 20, "rad" = 20, "fire" = 60, "acid" = 60)
body_parts_covered = CHEST|GROIN|ARMS
GainStation13/code/clothing/hud.dm
+14
View File
@@ -0,0 +1,14 @@
/obj/item/clothing/glasses/hud/health/gar
name = "gar health scanner HUD"
desc = "When you're scared, that's all the more reason to move forward!"
icon ='GainStation13/icons/obj/clothing/glasses.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/eyes.dmi'
icon_state = "garh"
item_state = "garh"
force = 10
throwforce = 10
throw_speed = 4
attack_verb = list("sliced")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
GainStation13/code/clothing/under.dm
+13
View File
@@ -21,3 +21,16 @@
mob_overlay_icon = 'GainStation13/icons/mob/uniform.dmi'
icon_state = "rsecuritypink"
item_state = "r_suit"
/obj/item/clothing/under/shorts/yellow
name = "Yellow workout short"
icon_state = "yellowwshort"
icon = 'GainStation13/icons/obj/clothing/uniforms.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/uniform.dmi'
/obj/item/clothing/under/shorts/pink
name = "Pink workout short"
icon_state = "pinkwshort"
icon = 'GainStation13/icons/obj/clothing/uniforms.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/uniform.dmi'
GainStation13/code/datums/crates.dm
+17
View File
@@ -0,0 +1,17 @@
//gs13 - solar defence crate
/obj/structure/closet/crate/solarpanel_defence
name = "solar system defence crate"
icon_state = "engi_e_crate"
/obj/structure/closet/crate/solarpanel_defence/PopulateContents()
..()
new /obj/machinery/satellite/meteor_shield(src)
new /obj/machinery/satellite/meteor_shield(src)
new /obj/machinery/satellite/meteor_shield(src)
new /obj/machinery/satellite/meteor_shield(src)
new /obj/item/paper/guides/jobs/engi/solar_defence(src)
new /obj/item/circuitboard/computer/sat_control(src)
/obj/item/paper/guides/jobs/engi/solar_defence
name = "Info on Satellite Defence"
info = "<h1>Welcome</h1><p>With this crate, you will be able to protect the station's solar arrays from constant barrages of space sand. The set-up is simple. Drag around all the satellites in front of solar panel arrays, preferably in direction open to space (the best spot is near the solar tracker and outside of the grilles), as that is where the space sand will come from. It's advised to set down just 1 satellite for each solar array. Once you set the satellite down, you can activate it by flicking on the switch. The crate also provides you with an OPTIONAL computer board to keep track of your defence satellites. Voila!</p>"
GainStation13/code/game/plushes.dm
+8
View File
@@ -66,3 +66,11 @@
/obj/item/toy/plush/gs13/mammal/fox
icon_state = "fox"
/obj/item/toy/plush/mothplushie/moffplush
name = "moth plushie"
desc = "A plushie depicting an adorable mothperson. It's a huggable bug!"
icon_state = "moffplush"
item_state = "moffplush"
squeak_override = list('modular_citadel/sound/voice/scream_moth.ogg' = 1)
GainStation13/code/game/turfs/open.dm
+22
View File
@@ -59,3 +59,25 @@
name = "gato-themed carpet"
icon_state = "tile-carpet-gato"
turf_type = /turf/open/floor/carpet/gato
/turf/open/indestructible/layenia/crystal
name = "Lattice Crystal"
desc = "A glowing azure crystal, with strange properties to make things float."
icon = 'GainStation13/icons/turf/crystal_floor.dmi'
baseturfs = /turf/open/indestructible/layenia/crystal
slowdown = 1
light_range = 4
light_power = 0.5
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
light_color = LIGHT_COLOR_BLUE
initial_gas_mix = FROZEN_ATMOS
planetary_atmos = TRUE
smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
canSmoothWith = list(/turf/open/indestructible/layenia/crystal)
/turf/open/indestructible/layenia/crystal/garden
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
planetary_atmos = TRUE
GainStation13/code/modules/gym/gym.dm
+2 -2
View File
@@ -83,7 +83,7 @@
/obj/item/circuitboard/machine/treadmill
name = "Treadmill (Machine Board)"
build_path = /obj/machinery/autolathe
build_path = /obj/item/conveyor_construct/treadmill
req_components = list(/obj/item/stock_parts/manipulator = 1)
/datum/design/treadmill
@@ -91,7 +91,7 @@
id = "treadmill"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
build_path = /obj/item/circuitboard/machine/treadmill
build_path = /obj/machinery/treadmill
category = list("inital", "Construction")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
GainStation13/code/structures/table.dm
+37
View File
@@ -0,0 +1,37 @@
/obj/structure/table/plaswood
name = "plaswood table"
desc = "An strong and grey wooden table."
icon = 'GainStation13/icons/obj/smooth_structures/plaswoodpoker_table.dmi'
icon_state = "plaswood_table"
resistance_flags = FLAMMABLE
max_integrity = 200
integrity_failure = 50
armor = list("melee" = 10, "bullet" = 30, "laser" = 30, "energy" = 100, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
canSmoothWith = list(/obj/structure/table/plaswood,
/obj/structure/table/plaswood/plaswoodpoker)
/obj/structure/table/plaswood/plaswoodpoker
name = "gambling table"
desc = "A seedy table for seedy dealings in seedy places."
icon = 'GainStation13/icons/obj/smooth_structures/plaswoodpoker_table.dmi'
icon_state = "plaswoodpoker_table"
frame = /obj/structure/table_frame/plaswood
buildstack = /obj/item/stack/tile/carpet
/obj/structure/table/gmushroom
name = "Mushroom table"
desc = "A pinkish table. And is fireproof!"
icon = 'GainStation13/icons/obj/smooth_structures/gmushroom_table.dmi'
icon_state = "gmushroom_table"
resistance_flags = FIRE_PROOF
max_integrity = 70
canSmoothWith = list(/obj/structure/table/gmushroom,
/obj/structure/table/gmushroom/gmushroompoker)
/obj/structure/table/gmushroom/gmushroompoker
name = "gambling table"
desc = "A seedy table for seedy dealings in seedy places."
icon = 'GainStation13/icons/obj/smooth_structures/gmushroompoker_table.dmi'
icon_state = "gmushroompoker_table"
frame = /obj/structure/table_frame/gmushroom
buildstack = /obj/item/stack/tile/carpet