cyberpresidentvanellope/GS13-Citadel
1
0
Fork 0
mirror of https://github.com/evilew/GS13-Citadel.git synced 2026-07-09 23:29:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187 from Phantastic-Swan/bugfixeeeeees

Browse Source 
Bugfixes
This commit is contained in:
evilew
2025-08-02 23:45:00 -05:00
committed by GitHub
parent ad7c3f2be6 401cf233d2
commit 01acf44cd1
6 changed files with 377 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/game/objects/structures/signs/signs_maps.dm
+4
View File
@@ -0,0 +1,4 @@
/obj/structure/sign/directions/service
name = "service"
desc = "A direction sign, pointing out which way the caffeteria is."
icon_state = "direction_service"
GainStation13/icons/obj/decals.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

_maps/map_files/Snaxi/Snaxi.dmm
+359 -349
View File
File diff suppressed because it is too large Load Diff
code/datums/materials/basemats.dm
+1 -1
View File
@@ -3,7 +3,7 @@
name = "iron"
desc = "Common iron ore often found in sedimentary and igneous layers of the crust."
color = "#878687"
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE/*GS13 EDIT , MAT_CATEGORY_BASE_RECIPES = TRUE GS13 END EDIT*/)
sheet_type = /obj/item/stack/sheet/metal
value_per_unit = 0.0025
code/game/objects/items/stacks/sheets/sheet_types.dm
+5 -1
View File
@@ -67,12 +67,16 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("radiation closet", /obj/structure/closet/radiation/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("biohazard gear closet", /obj/structure/closet/l3closet/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
)), \
// moves the recipe for a sink, toilet and chair from base recipes (since base recipes has a floor tile which is bugged)
new /datum/stack_recipe("Chair", /obj/structure/chair/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE), \
new /datum/stack_recipe("Toilet", /obj/structure/toilet/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE), \
new /datum/stack_recipe("Sink Frame", /obj/structure/sink/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE), \
// GS13 END EDIT
null, \
new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("trash bin", /obj/structure/closet/crate/bin, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE),\
null, \
new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
new/datum/stack_recipe("Floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
null, \
new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = TRUE, on_floor = TRUE, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75), \
tgstation.dme
+8 -7
View File
@@ -3973,6 +3973,7 @@
#include "GainStation13\code\game\objects\items\stacks\sheets\sheet_types.dm"
#include "GainStation13\code\game\objects\items\stacks\tiles\tile_types.dm"
#include "GainStation13\code\game\objects\items\storage\bags.dm"
#include "GainStation13\code\game\objects\items\storage\fancy.dm"
#include "GainStation13\code\game\objects\items\storage\firstaid.dm"
#include "GainStation13\code\game\objects\structures\barsigns.dm"
#include "GainStation13\code\game\objects\structures\crate.dm"
@@ -3988,6 +3989,7 @@
#include "GainStation13\code\game\objects\structures\crates_lockers\closets\utility_closets.dm"
#include "GainStation13\code\game\objects\structures\crates_lockers\closets\secure\psychology.dm"
#include "GainStation13\code\game\objects\structures\crates_lockers\crates\wooden.dm"
#include "GainStation13\code\game\objects\structures\signs\signs_maps.dm"
#include "GainStation13\code\game\turfs\closed.dm"
#include "GainStation13\code\game\turfs\open.dm"
#include "GainStation13\code\game\turfs\simulated\floor\fancy_floor.dm"
@@ -4034,6 +4036,10 @@
#include "GainStation13\code\modules\cargo\packs.dm"
#include "GainStation13\code\modules\cargo\bounties\assistant.dm"
#include "GainStation13\code\modules\cargo\bounties\mining.dm"
#include "GainStation13\code\modules\cargo\packs\engineering.dm"
#include "GainStation13\code\modules\cargo\packs\materials.dm"
#include "GainStation13\code\modules\cargo\packs\organic.dm"
#include "GainStation13\code\modules\cargo\packs\science.dm"
#include "GainStation13\code\modules\client\border_control.dm"
#include "GainStation13\code\modules\client\loadout\head.dm"
#include "GainStation13\code\modules\client\loadout\uniform.dm"
@@ -4067,12 +4073,6 @@
#include "GainStation13\code\modules\language\tajara.dm"
#include "GainStation13\code\modules\loadout\backpack.dm"
#include "GainStation13\code\modules\loadout\gloves.dm"
#include "GainStation13\code\modules\mob\living\simple_animal\friendly\wisest_cow.dm"
#include "GainStation13\code\game\objects\items\storage\fancy.dm"
#include "GainStation13\code\modules\cargo\packs\engineering.dm"
#include "GainStation13\code\modules\cargo\packs\materials.dm"
#include "GainStation13\code\modules\cargo\packs\organic.dm"
#include "GainStation13\code\modules\cargo\packs\science.dm"
#include "GainStation13\code\modules\loadout\neck.dm"
#include "GainStation13\code\modules\loadout\tablet.dm"
#include "GainStation13\code\modules\mapping\areas.dm"
@@ -4098,6 +4098,7 @@
#include "GainStation13\code\modules\mob\living\species.dm"
#include "GainStation13\code\modules\mob\living\taur_belly.dm"
#include "GainStation13\code\modules\mob\living\carbon\human\species_types\mootant.dm"
#include "GainStation13\code\modules\mob\living\simple_animal\friendly\wisest_cow.dm"
#include "GainStation13\code\modules\mob\living\vore\eating\trasheat_lists.dm"
#include "GainStation13\code\modules\mod\modules\modules_fat.dm"
#include "GainStation13\code\modules\power\energy_harvester.dm"
@@ -4108,8 +4109,8 @@
#include "GainStation13\code\modules\reagents\chemistry\reagents\other_reagents.dm"
#include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm"
#include "GainStation13\code\modules\reagents\chemistry\recipes\fatdrinks.dm"
#include "GainStation13\code\modules\reagents\chemistry\recipes\others.dm"
#include "GainStation13\code\modules\reagents\chemistry\recipes\medicine.dm"
#include "GainStation13\code\modules\reagents\chemistry\recipes\others.dm"
#include "GainStation13\code\modules\reagents\chemistry\recipes\ROCKANDSTONEdrinks.dm"
#include "GainStation13\code\modules\reagents\reagent_containers\barrel_tank.dm"
#include "GainStation13\code\modules\reagents\reagent_containers\pill.dm"