mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] ports a bunch of grep checks from TG (#10361)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
committed by
GitHub
parent
21031b169b
commit
3cfc33bfde
@@ -62,4 +62,4 @@ var/list/topic_commands_names = list()
|
||||
|
||||
/client
|
||||
var/received_discord_pm
|
||||
var/discord_admin
|
||||
var/discord_admin
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
|
||||
/datum/category_item/autolathe/arms/shotgun_drum_empty
|
||||
name = "shotgun 12g drum magazine (Empty)"
|
||||
path =/obj/item/ammo_magazine/m12gdrumjack/empty
|
||||
path =/obj/item/ammo_magazine/m12gdrumjack/empty
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
|
||||
/datum/category_item/autolathe/tools/shovel
|
||||
name = "shovel"
|
||||
path =/obj/item/shovel
|
||||
path =/obj/item/shovel
|
||||
|
||||
@@ -82,5 +82,5 @@
|
||||
var/mutable_appearance/underlay_appearance = mutable_appearance(initial(path.icon), do_state, layer = TURF_LAYER-0.02, plane = do_plane)
|
||||
underlay_appearance.appearance_flags = RESET_ALPHA | RESET_COLOR
|
||||
our_turf.underlays += underlay_appearance
|
||||
|
||||
|
||||
return TRUE
|
||||
|
||||
@@ -25,4 +25,4 @@
|
||||
volume = 40
|
||||
volume_chan = VOLUME_CHANNEL_AMBIENCE
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -30,4 +30,4 @@
|
||||
l_pocket = /obj/item/ammo_magazine/clip/c762
|
||||
r_pocket = /obj/item/ammo_magazine/clip/c762
|
||||
|
||||
var/faction = "voxpirate"
|
||||
var/faction = "voxpirate"
|
||||
|
||||
@@ -11,4 +11,4 @@
|
||||
/obj/fiftyspawner/gaycarpet,
|
||||
/obj/fiftyspawner/purcarpet,
|
||||
/obj/fiftyspawner/oracarpet
|
||||
) //REEE
|
||||
) //REEE
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Blueshield equipment"
|
||||
access = access_blueshield_exclusive
|
||||
|
||||
|
||||
/datum/supply_pack/misc/blueshieldweapons
|
||||
name = "Blueshield Weapon Kits"
|
||||
contains = list(
|
||||
@@ -32,4 +32,4 @@
|
||||
)
|
||||
cost = 75
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Bluespace Radio Packs"
|
||||
containername = "Bluespace Radio Packs"
|
||||
|
||||
@@ -6,4 +6,4 @@
|
||||
cost = 100
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Loyalty Implants Lockbox crate"
|
||||
access = access_heads
|
||||
access = access_heads
|
||||
|
||||
@@ -8,7 +8,7 @@ var/datum/uplink/uplink = new()
|
||||
/datum/uplink/New(var/type)
|
||||
items_assoc = list()
|
||||
items = init_subtypes(/datum/uplink_item)
|
||||
categories = init_subtypes(/datum/uplink_category)
|
||||
categories = init_subtypes(/datum/uplink_category)
|
||||
categories = dd_sortedObjectList(categories)
|
||||
|
||||
for(var/datum/uplink_item/item in items)
|
||||
|
||||
@@ -85,15 +85,15 @@
|
||||
/datum/stored_item/stack/get_product(var/product_location, var/count)
|
||||
if(!LAZYLEN(instances))
|
||||
return null // Shouldn't happen, but will loudly complain if it breaks
|
||||
|
||||
|
||||
var/obj/item/stack/S = instances[1]
|
||||
count = min(count, S.get_max_amount())
|
||||
src.amount -= count // We won't vend more than one full stack per call
|
||||
|
||||
|
||||
// Case 1: Draw the full amount from the first instance
|
||||
if(count < S.get_amount())
|
||||
S = S.split(count)
|
||||
|
||||
|
||||
// Case 2: Amount at least one stack, or have to accumulate
|
||||
else if(count >= S.get_amount())
|
||||
count -= S.get_amount()
|
||||
|
||||
Reference in New Issue
Block a user