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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336

Browse Source
This commit is contained in:
Ghommie
2019-11-15 01:10:39 +01:00
parent 322c90fab2 90b02db98c
commit c20bc123ab
497 changed files with 32242 additions and 135366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/game/area/areas.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 559 B

modular_citadel/code/game/area/cit_areas.dm
-18
View File
@@ -1,18 +0,0 @@
/area/maintenance/bar
name = "Maintenance Bar"
icon = 'modular_citadel/code/game/area/areas.dmi'
icon_state = "maintbar"
/area/maintenance/bar/cafe
name = "Abandoned Cafe"
/area/crew_quarters/theatre/clown
name = "Clown's Office"
/area/crew_quarters/theatre/mime
name = "Mime's Office"
/area/crew_quarters/cryopod
name = "Cryogenics"
icon = 'modular_citadel/code/game/area/areas.dmi'
icon_state = "cryo"
modular_citadel/code/game/gamemodes/gangs/gangtool.dm
+1 -1
View File
@@ -130,7 +130,7 @@
/obj/item/device/gangtool/proc/ping_gang(mob/user)
if(!can_use(user))
return
var/message = stripped_input(user,"Discreetly send a gang-wide message.","Send Message") as null|text
var/message = stripped_input(user,"Discreetly send a gang-wide message.","Send Message")
if(!message || !can_use(user))
return
if(!is_station_level(user.z))
modular_citadel/code/game/machinery/doors/airlock.dm
-2
View File
@@ -1,2 +0,0 @@
/obj/machinery/door/airlock
var/wiretypepath = /datum/wires/airlock
modular_citadel/code/game/machinery/doors/airlock_types.dm
-29
View File
@@ -1,29 +0,0 @@
/obj/machinery/door/airlock/command
wiretypepath = /datum/wires/airlock/command
/obj/machinery/door/airlock/security
wiretypepath = /datum/wires/airlock/security
/obj/machinery/door/airlock/engineering
wiretypepath = /datum/wires/airlock/engineering
/obj/machinery/door/airlock/medical
wiretypepath = /datum/wires/airlock/medical
/obj/machinery/door/airlock/mining
wiretypepath = /datum/wires/airlock/cargo
/obj/machinery/door/airlock/atmos
wiretypepath = /datum/wires/airlock/engineering
/obj/machinery/door/airlock/research
wiretypepath = /datum/wires/airlock/science
/obj/machinery/door/airlock/science
wiretypepath = /datum/wires/airlock/science
/obj/machinery/door/airlock/virology
wiretypepath = /datum/wires/airlock/medical
/obj/machinery/door/airlock/vault
wiretypepath = /datum/wires/airlock/secure
modular_citadel/code/game/machinery/toylathe.dm
+2 -2
View File
@@ -178,7 +178,7 @@
matching_designs.Cut()
for(var/v in stored_research.researched_designs)
var/datum/design/D = stored_research.researched_designs[v]
var/datum/design/D = SSresearch.techweb_design_by_id(v)
if(findtext(D.name,href_list["to_search"]))
matching_designs.Add(D)
updateUsrDialog()
@@ -254,7 +254,7 @@
dat += materials_printout()
for(var/v in stored_research.researched_designs)
var/datum/design/D = stored_research.researched_designs[v]
var/datum/design/D = SSresearch.techweb_design_by_id(v)
if(!(selected_category in D.category))
continue
modular_citadel/code/game/objects/items/storage/firstaid.dm
+2 -2
View File
@@ -28,8 +28,8 @@
icon_state = "rad"
/obj/item/storage/firstaid/radbgone/Initialize(mapload)
. = ..()
icon_state = pick("[initial(icon_state)]","[initial(icon_state)]2","[initial(icon_state)]3","[initial(icon_state)]4")
. = ..()
icon_state = pick("[initial(icon_state)]","[initial(icon_state)]2","[initial(icon_state)]3","[initial(icon_state)]4")
/obj/item/storage/firstaid/tactical
icon_state = "tactical"
modular_citadel/code/game/objects/structures/crates_lockers/closets/secure/citadel_lockers.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
..()
new /obj/item/radio/headset/heads/qm(src)
..()
new /obj/item/radio/headset/heads/qm(src)
/obj/structure/closet/secure_closet/CMO/PopulateContents()
..()