literally everything Bhjin has been complaining about

also modularizes stuff and adds more comments. Like responsible downstream repos should have.
This commit is contained in:
Poojawa
2018-09-18 03:59:46 -05:00
parent dc9fd6db12
commit 7d300117af
11 changed files with 72 additions and 27 deletions
+2 -5
View File
@@ -112,10 +112,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/obj/item/Initialize()
materials = typelist("materials", materials)
if (attack_verb)
attack_verb = typelist("attack_verb", attack_verb)
. = ..()
for(var/path in actions_types)
new path(src)
@@ -799,6 +799,3 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if (item_flags & NODROP)
return
return ..()
/obj/item/proc/grenade_prime_react(obj/item/grenade/nade)
return
@@ -9,10 +9,11 @@
name = "inconspicious box"
desc = "It's so normal that you didn't notice it before."
icon_state = "agentbox"
move_speed_multiplier = 0.5
use_mob_movespeed = TRUE
/obj/structure/closet/cardboard/agent/proc/go_invisible()
animate(src, , alpha = 0, time = 5)
START_PROCESSING(SSobj, src)
/obj/structure/closet/cardboard/agent/Initialize()
. = ..()
@@ -24,7 +25,13 @@
qdel(src)
/obj/structure/closet/cardboard/agent/process()
alpha = max(0, alpha - 50)
//alpha = max(0, alpha - 50) //Citadel edit
animate(src, , alpha = alpha - 50, time = 3)
/obj/structure/closet/cardboard/agent/Move()
. = ..()
if(.)
alpha = min(alpha + 5, 255)
/obj/structure/closet/cardboard/agent/proc/reveal()
alpha = 255
+10 -3
View File
@@ -79,10 +79,17 @@
has_latches = FALSE
/obj/item/storage/toolbox/mechanical/old/heirloom
name = "toolbox" //this will be named "X family toolbox"
name = "old, robust toolbox" //this will be named "X family toolbox"
desc = "It's seen better days."
force = 5
w_class = WEIGHT_CLASS_NORMAL
//Citadel change buffed to base levels
total_mass = 2
/obj/item/storage/toolbox/mechanical/old/heirloom/afterattack(atom/A, mob/user, proximity) //Citadel Adds massive buff to machinery destruction
. = ..()
if(proximity)
if(isobj(A))
var/obj/O = A
O.take_damage(20)
/obj/item/storage/toolbox/mechanical/old/heirloom/PopulateContents()
return
+1 -1
View File
@@ -242,7 +242,7 @@
//Give the gas a chance to build up more pressure through reacting
air_contents.react(src)
air_contents.react(src)
air_contents.react(src)
//Citadel Edit: removing extra react for "balance"
pressure = air_contents.return_pressure()
var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE
var/turf/epicenter = get_turf(loc)
+5 -7
View File
@@ -485,6 +485,8 @@
return
. = ..()
//Citadel additions : attack_self and rightclick_attack_self
/obj/item/twohanded/rightclick_attack_self(mob/user)
if(wielded) //Trying to unwield it
unwield(user)
@@ -494,12 +496,10 @@
/obj/item/twohanded/spear/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] begins to sword-swallow \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
if(explosive)
if(explosive) //Citadel Edit removes qdel and explosive.forcemove(AM)
user.say("[war_cry]", forced="spear warcry")
explosive.forceMove(user)
explosive.prime()
user.gib()
qdel(src)
return BRUTELOSS
return BRUTELOSS
@@ -524,13 +524,11 @@
return
if(isopenturf(AM)) //So you can actually melee with it
return
if(explosive && wielded)
if(explosive && wielded) //Citadel edit removes qdel and explosive.forcemove(AM)
user.say("[war_cry]", forced="spear warcry")
explosive.forceMove(AM)
explosive.prime()
qdel(src)
/obj/item/twohanded/spear/grenade_prime_react(obj/item/grenade/nade)
/obj/item/twohanded/spear/grenade_prime_react(obj/item/grenade/nade) //Citadel edit, removes throw_impact because memes
nade.forceMove(get_turf(src))
qdel(src)
@@ -16,13 +16,14 @@
var/move_speed_multiplier = 1
var/move_delay = FALSE
var/egged = 0
var/use_mob_movespeed = FALSE //Citadel adds snowflake box handling
/obj/structure/closet/cardboard/relaymove(mob/user, direction)
if(opened || move_delay || user.stat || user.IsStun() || user.IsKnockdown() || user.IsUnconscious() || !isturf(loc) || !has_gravity(loc))
return
move_delay = TRUE
if(step(src, direction))
addtimer(CALLBACK(src, .proc/ResetMoveDelay), CONFIG_GET(number/movedelay/walk_delay) * move_speed_multiplier)
addtimer(CALLBACK(src, .proc/ResetMoveDelay), (use_mob_movespeed ? user.movement_delay() : CONFIG_GET(number/movedelay/walk_delay)) * move_speed_multiplier)
else
ResetMoveDelay()