various citadel tweaks/fixes

remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
This commit is contained in:
Poojawa
2018-09-17 03:26:05 -05:00
parent ca822954e4
commit 99e57fb221
9 changed files with 14 additions and 10 deletions

View File

@@ -2427,7 +2427,8 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/deepstorage/power)
"fo" = (
/obj/machinery/suit_storage_unit/standard_unit,
/obj/machinery/suit_storage_unit/mining/eva,
/obj/item/tank/jetpack/oxygen,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/deepstorage/power)

View File

@@ -57,11 +57,11 @@
#define DNA_HAIR_STYLE_BLOCK 7
#define DNA_COLOR_ONE_BLOCK 8
#define DNA_COLOR_TWO_BLOCK 9
#define DNA_COLOR_THREE_BLOCK 10
#define DNA_COLOR_THREE_BLOCK 10
#define DNA_MUTANTTAIL_BLOCK 11
#define DNA_MUTANTEAR_BLOCK 12
#define DNA_MUTANTMARKING_BLOCK 13
#define DNA_TAUR_BLOCK 14
#define DNA_MUTANTEAR_BLOCK 12
#define DNA_MUTANTMARKING_BLOCK 13
#define DNA_TAUR_BLOCK 14
#define DNA_STRUC_ENZYMES_BLOCKS 18
#define DNA_UNIQUE_ENZYMES_LEN 32

View File

@@ -757,6 +757,9 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
to_chat(src, "<span class='danger'>Your previous click was ignored because you've done too many in a second</span>")
return
if(ab) //Citadel edit, things with stuff.
return
if (prefs.hotkeys)
// If hotkey mode is enabled, then clicking the map will automatically
// unfocus the text bar. This removes the red color from the text bar

View File

@@ -205,7 +205,7 @@
var/old_eye_blurry = eye_blurry
eye_blurry = max(amount, eye_blurry)
if(!old_eye_blurry)
add_eyeblur()
add_eyeblur() //Citadel edit blurry eye memes entailed. syncs beware
/mob/proc/adjust_blurriness(amount)
var/old_eye_blurry = eye_blurry

View File

@@ -69,7 +69,7 @@
/obj/item/projectile/beam/disabler
name = "disabler beam"
icon_state = "omnilaser"
damage = 36
damage = 24 // Citadel change for balance from 36
damage_type = STAMINA
flag = "energy"
hitsound = 'sound/weapons/tap.ogg'

View File

@@ -223,7 +223,7 @@
list_reagents = list("chloralhydrate" = 50)
/obj/item/reagent_containers/syringe/lethal/execution
list_reagents = list("plasma" = 15, "formaldehyde" = 15, "cyanide" = 10, "facid" = 10)
list_reagents = list("amatoxin" = 15, "formaldehyde" = 15, "cyanide" = 10, "facid" = 10) //Citadel edit, changing out plasma from lethals
/obj/item/reagent_containers/syringe/mulligan
name = "Mulligan"

View File

@@ -148,7 +148,7 @@
materials = list(MAT_METAL = 3000)
build_path = /obj/item/grenade/chem_grenade/large
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE //Citadel edit added to science
/datum/design/pyro_grenade
name = "Pyro Grenade"

View File

@@ -106,7 +106,7 @@
..()
if(crit_fail)
return
owner.adjustStaminaLoss(-3.5) //Citadel edit, makes it more useful in Stamina based combat
if(owner.AmountStun() > STUN_SET_AMOUNT)
owner.SetStun(STUN_SET_AMOUNT)
if(owner.AmountKnockdown() > STUN_SET_AMOUNT)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 111 KiB