mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] next grep, no spaces (#10548)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
16a213f699
commit
8d0febfbb6
@@ -44,15 +44,15 @@
|
||||
contraband = 1
|
||||
|
||||
/datum/supply_pack/munitions/bolt_rifles_militia
|
||||
name = "Weapon - Surplus militia rifles"
|
||||
contains = list(
|
||||
/obj/item/gun/projectile/shotgun/pump/rifle = 3,
|
||||
/obj/item/ammo_magazine/clip/c762 = 6
|
||||
)
|
||||
cost = 1000
|
||||
contraband = 1
|
||||
containertype = /obj/structure/closet/crate/hedberg
|
||||
containername = "Ballistic weapons crate"
|
||||
name = "Weapon - Surplus militia rifles"
|
||||
contains = list(
|
||||
/obj/item/gun/projectile/shotgun/pump/rifle = 3,
|
||||
/obj/item/ammo_magazine/clip/c762 = 6
|
||||
)
|
||||
cost = 1000
|
||||
contraband = 1
|
||||
containertype = /obj/structure/closet/crate/hedberg
|
||||
containername = "Ballistic weapons crate"
|
||||
|
||||
/datum/supply_pack/randomised/misc/telecrate
|
||||
name = "Confiscated equipment"
|
||||
|
||||
@@ -233,7 +233,7 @@
|
||||
edge_blending_priority = 4
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/desert_planet/sand)
|
||||
|
||||
//I want this for the water tiles
|
||||
//I want this for the water tiles
|
||||
/turf/simulated/floor/water
|
||||
name = "shallow water"
|
||||
desc = "A body of water. It seems shallow enough to walk through, if needed."
|
||||
|
||||
@@ -332,7 +332,7 @@
|
||||
new /obj/item/bikehorn(location)
|
||||
M.custom_pain("You suddenly cough up a bikehorn!",60)
|
||||
|
||||
/*why is this in here twice? -Lo
|
||||
/*why is this in here twice? -Lo
|
||||
/datum/reagent/inaprovaline/synxchem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(alien != IS_DIONA)
|
||||
if(prob(5))
|
||||
@@ -851,30 +851,30 @@
|
||||
/mob/living/simple_mob/animal/synx/ai/pet/greed/synth
|
||||
|
||||
/*
|
||||
▓███▓ ▓▓▓ ▓▓▓ ▓▓▓ ▓▓▓ ▓███▓
|
||||
▓▓ ▓▓▓█ ▓▓ ▓▓█ ▓▓ ▓▓█ ▓▓ ▓▓█ ▓▓ ▓▓█ ▓▓ ▓▓▓█
|
||||
▓ ▓▓▓▓ ▓▓▓ ▓▓▓ ▓▓▓ ▓▓▓ ▓▓▓▓
|
||||
▓ █▓▓▓ █▓▓ █▓▓ █▓▓ █▓▓ █▓▓▓
|
||||
▓ █▓▓▓▓█ █▓▓ ▓█ █▓▓ ▓█ █▓▓█▓█ █▓▓▓ █▓▓▓
|
||||
▓ █▓▓▓ ▓█▓ █▓█▓█ █▓█▓█ ▓▓█ ▓█ █▓▓▓
|
||||
▓█ █▓▓▓ ▓▓▓ ▓▓▓ ▓▓ █▓▓▓
|
||||
▓▓ █▓▓ ▓ ▓ ▓ █▓▓▓
|
||||
▓ █▓▓ ▓█ █▓▓
|
||||
▓ ▓▓▓ ▓▓ █▓▓
|
||||
█\ ▓▓ ▓▓ ▓█ ▓ █▓▓
|
||||
▓█\ ▓█ ▓█▓ ▓▓▓ █▓ █▓▓
|
||||
▓▓▓█ ▓ ▓▓▓▓ ▓ ▓▓ ▓ █▓▓
|
||||
▓█▓ ▓▓█▓▓ ▓ ▓▓ ▓▓▓
|
||||
▓▓ █▓▓█ █▓ █▓▓
|
||||
▓▓ ▓▓▓ ▓▓ █▓▓
|
||||
▓ ▓▓▓ ▓ █▓▓
|
||||
▓▓ █▓▓█ █▓ █▓▓▓
|
||||
▓ █▓▓▓ ▓▓█ █▓█ ▓▓ █▓▓▓
|
||||
▓ █▓▓▓▓▓ ▓▓█ ▓▓ ▓▓█▓ █▓▓▓
|
||||
▓ █▓▓▓ ▓▓▓ ▓▓▓ █▓▓▓
|
||||
▓ █▓▓▓ ▓▓▓ ▓▓▓ █▓▓▓
|
||||
▓█▓██▓▓▓█▓█▓█▓▓▓█▓█▓█▓▓▓█▓█▓██▓▓▓
|
||||
*/
|
||||
* ▓███▓ ▓▓▓ ▓▓▓ ▓▓▓ ▓▓▓ ▓███▓
|
||||
* ▓▓ ▓▓▓█ ▓▓ ▓▓█ ▓▓ ▓▓█ ▓▓ ▓▓█ ▓▓ ▓▓█ ▓▓ ▓▓▓█
|
||||
* ▓ ▓▓▓▓ ▓▓▓ ▓▓▓ ▓▓▓ ▓▓▓ ▓▓▓▓
|
||||
* ▓ █▓▓▓ █▓▓ █▓▓ █▓▓ █▓▓ █▓▓▓
|
||||
* ▓ █▓▓▓▓█ █▓▓ ▓█ █▓▓ ▓█ █▓▓█▓█ █▓▓▓ █▓▓▓
|
||||
* ▓ █▓▓▓ ▓█▓ █▓█▓█ █▓█▓█ ▓▓█ ▓█ █▓▓▓
|
||||
* ▓█ █▓▓▓ ▓▓▓ ▓▓▓ ▓▓ █▓▓▓
|
||||
* ▓▓ █▓▓ ▓ ▓ ▓ █▓▓▓
|
||||
* ▓ █▓▓ ▓█ █▓▓
|
||||
* ▓ ▓▓▓ ▓▓ █▓▓
|
||||
* █\ ▓▓ ▓▓ ▓█ ▓ █▓▓
|
||||
* ▓█\ ▓█ ▓█▓ ▓▓▓ █▓ █▓▓
|
||||
* ▓▓▓█ ▓ ▓▓▓▓ ▓ ▓▓ ▓ █▓▓
|
||||
* ▓█▓ ▓▓█▓▓ ▓ ▓▓ ▓▓▓
|
||||
* ▓▓ █▓▓█ █▓ █▓▓
|
||||
* ▓▓ ▓▓▓ ▓▓ █▓▓
|
||||
* ▓ ▓▓▓ ▓ █▓▓
|
||||
* ▓▓ █▓▓█ █▓ █▓▓▓
|
||||
* ▓ █▓▓▓ ▓▓█ █▓█ ▓▓ █▓▓▓
|
||||
* ▓ █▓▓▓▓▓ ▓▓█ ▓▓ ▓▓█▓ █▓▓▓
|
||||
* ▓ █▓▓▓ ▓▓▓ ▓▓▓ █▓▓▓
|
||||
* ▓ █▓▓▓ ▓▓▓ ▓▓▓ █▓▓▓
|
||||
* ▓█▓██▓▓▓█▓█▓█▓▓▓█▓█▓█▓▓▓█▓█▓██▓▓▓
|
||||
*/
|
||||
icon_state = "synx_C_living"
|
||||
icon_living = "synx_C_living"
|
||||
icon_dead = "synx_C_dead"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
//Cataloguer things
|
||||
//Cataloguer things
|
||||
/datum/category_item/catalogue/fauna/livingcandy
|
||||
name = "Living Candy"
|
||||
desc = "Upon investigation of the strange creatures, a mix of \
|
||||
|
||||
@@ -208,5 +208,5 @@
|
||||
spread_range = 60
|
||||
|
||||
/obj/item/projectile/energy/spikeenergy_ball/slow
|
||||
speed = 15
|
||||
range = 20
|
||||
speed = 15
|
||||
range = 20
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/**
|
||||
* tgui state: ticket_state
|
||||
*
|
||||
* Grants the user UI_INTERACTIVE, if a ticket is open.
|
||||
**/
|
||||
/**
|
||||
* tgui state: ticket_state
|
||||
*
|
||||
* Grants the user UI_INTERACTIVE, if a ticket is open.
|
||||
*/
|
||||
|
||||
GLOBAL_DATUM_INIT(tgui_ticket_state, /datum/tgui_state/ticket_state, new)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user