mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
[MIRROR] space cleanup (#10414)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
3ef8163aa0
commit
789db280cc
@@ -450,7 +450,7 @@ ESCAPE_POD(1)
|
|||||||
/datum/map_template/om_ships/hybrid
|
/datum/map_template/om_ships/hybrid
|
||||||
name = "OM Ship - Generic Shuttle"
|
name = "OM Ship - Generic Shuttle"
|
||||||
desc = "A small privately-owned vessel."
|
desc = "A small privately-owned vessel."
|
||||||
mappath = 'generic_shuttle.dmm'
|
mappath = "maps/cynosure/generic_shuttle.dmm"
|
||||||
annihilate = TRUE
|
annihilate = TRUE
|
||||||
|
|
||||||
// The shuttle's area(s)
|
// The shuttle's area(s)
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ Class Variables:
|
|||||||
EMPED:16 -- temporary broken by EMP pulse
|
EMPED:16 -- temporary broken by EMP pulse
|
||||||
|
|
||||||
Class Procs:
|
Class Procs:
|
||||||
New() 'game/machinery/machine.dm'
|
Initialize(mapload) 'game/machinery/machine.dm'
|
||||||
|
|
||||||
Destroy() 'game/machinery/machine.dm'
|
Destroy() 'game/machinery/machine.dm'
|
||||||
|
|
||||||
|
|||||||
@@ -386,7 +386,6 @@
|
|||||||
icon_state = "asymmetric_cloak"
|
icon_state = "asymmetric_cloak"
|
||||||
hoodtype = /obj/item/clothing/head/hood/cloak/asymmetric
|
hoodtype = /obj/item/clothing/head/hood/cloak/asymmetric
|
||||||
|
|
||||||
|
|
||||||
/obj/item/clothing/suit/storage/hooded/cloak/fancy
|
/obj/item/clothing/suit/storage/hooded/cloak/fancy
|
||||||
name = "hooded fancy cloak"
|
name = "hooded fancy cloak"
|
||||||
desc = "A fancy black hooded cloak."
|
desc = "A fancy black hooded cloak."
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
* * items are objects. Fruits, tools, circuit boards.
|
* * items are objects. Fruits, tools, circuit boards.
|
||||||
* * result is type to create as new object
|
* * result is type to create as new object
|
||||||
* * time is optional parameter, you shall use in in your machine,
|
* * time is optional parameter, you shall use in in your machine,
|
||||||
default /datum/recipe/ procs does not rely on this parameter.
|
* default /datum/recipe/ procs does not rely on this parameter.
|
||||||
*
|
*
|
||||||
* Functions you need:
|
* Functions you need:
|
||||||
* /datum/recipe/proc/make(var/obj/container as obj)
|
* /datum/recipe/proc/make(var/obj/container as obj)
|
||||||
|
|||||||
@@ -1176,7 +1176,6 @@
|
|||||||
if(H.ckey != "radiantaurora")
|
if(H.ckey != "radiantaurora")
|
||||||
to_chat(H, span_warning("These don't look like they were made to fit you..."))
|
to_chat(H, span_warning("These don't look like they were made to fit you..."))
|
||||||
return 0
|
return 0
|
||||||
else
|
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
//Ryumi - Nikki Yumeno
|
//Ryumi - Nikki Yumeno
|
||||||
|
|||||||
@@ -19,6 +19,6 @@ the syntax is coalesce(var1,var2...)
|
|||||||
//as a second example you can also use coalesce as a fallback
|
//as a second example you can also use coalesce as a fallback
|
||||||
/proc/fetch_name_with_fallback(var/name,var/nametwo)
|
/proc/fetch_name_with_fallback(var/name,var/nametwo)
|
||||||
coalesce(name, nametwo, "Not found")
|
coalesce(name, nametwo, "Not found")
|
||||||
//Now what this will do is return name, if name is not null, nametwo if name is null but nametwo isnt null
|
//Now what this will do is return name, if name is not null, nametwo if name is null but nametwo isnt null
|
||||||
//however if both given vars are in fact null we have a hardocded fallback "not found" that will always return instead
|
//however if both given vars are in fact null we have a hardocded fallback "not found" that will always return instead
|
||||||
//now the important part here is the order. Always put the fallback last as arguments are checked based on their occurence in the list.
|
//now the important part here is the order. Always put the fallback last as arguments are checked based on their occurence in the list.
|
||||||
|
|||||||
Reference in New Issue
Block a user