Removes some unused code
Fixes #3493
Fixes #3428
Fixes #3444
This commit is contained in:
Ron
2017-09-25 10:59:52 +03:00
committed by Erki
parent 085e4840e7
commit 95595e45af
6 changed files with 9 additions and 10 deletions
-3
View File
@@ -24,9 +24,6 @@
#define INFINITY 1.#INF
#define TICKS_IN_DAY 24*60*60*10
#define TICKS_IN_SECOND 10
// A neat little helper to convert the value X, that's between imin and imax, into a value
// that's proportionally scaled and in range of omin and omax.
#define MAP(x, imin, imax, omin, omax) ((x - imin) * (omax - omin) / (imax - imin) + omin)
+1 -1
View File
@@ -625,7 +625,7 @@
src.occupant_message("<span class='notice'>\The [user]'s claws are stopped by the armor.</span>")
visible_message("<span class='warning'>\The [user] rebounds off [src.name]'s armor!</span>")
else
user.visible_message("<span class='danger'>\The [user] hits \the [src]. Nothing happensm</span>","<span class='danger'>You hit \the [src] with no visible effect.</span>")
user.visible_message("<span class='danger'>\The [user] hits \the [src]. Nothing happens.</span>","<span class='danger'>You hit \the [src] with no visible effect.</span>")
src.log_append_to_last("Armor saved.")
return
else if ((HULK in user.mutations) && !deflect_hit(is_melee=1))
@@ -53,6 +53,8 @@
imp.part = affected
BITSET(H.hud_updateflag, IMPLOYAL_HUD)
if(istype(src.imp, /obj/item/weapon/implanter/loyalty))
M << "<span class ='notice'You feel a sudden surge of loyalty to [company_name]!</span>"
src.imp = null
update()
-5
View File
@@ -163,10 +163,5 @@ var/global/obj/item/device/radio/intercom/global_announcer = new(null)
var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian")
var/global/const/TICKS_IN_DAY = 864000
var/global/const/TICKS_IN_HOUR = 36000
var/global/const/TICKS_IN_SECOND = 10
//List of exosuit tracking beacons, to save performance
var/global/list/exo_beacons = list()
+1 -1
View File
@@ -46,7 +46,7 @@
user << "<span class='notice'>You begin dismantling \the [src].</span>"
if(do_after(user,25))
user << "<span class='notice'>You dismantle \the [src].</span>"
new /obj/item/stack/material/wood(get_turf(src), amount = 3)
new /obj/item/stack/material/wood(get_turf(src), 3)
for(var/obj/item/weapon/book/b in contents)
b.loc = (get_turf(src))
qdel(src)
+5
View File
@@ -0,0 +1,5 @@
author: Printer16
delete-after: True
changes:
- bugfix: "Deconstructing book cases now gives the proper type of wood."
- bugfix: "You will now receive a message when implanted with a loyalty implant."