cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into airlocking

Browse Source 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41F.dmm
	code/game/objects/structures/door_assembly.dm
This commit is contained in:
xxalpha
2015-08-30 19:53:54 +01:00
parent a2afb4caf1 32d74ad19c
commit 94f045b73f
337 changed files with 5899 additions and 4276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/barsigns.dm
+2 -2
View File
@@ -246,7 +246,7 @@
/datum/barsign/emergencyrumparty
name = "The Emergency Rum Party"
icon = "emergencyrumparty"
desc = "Still serving drinks that were banned years ago."
desc = "Recently relicensed after a long closure."
/datum/barsign/combocafe
name = "The Combo Cafe"
@@ -276,7 +276,7 @@
/datum/barsign/thenet
name = "The Net"
icon = "thenet"
desc = "The sea of drinkformation." //you couldn't come up with something better?
desc = "You just seem to get caught up in it for hours."
/datum/barsign/hiddensigns
code/game/objects/structures/crates_lockers/closets.dm
+1
View File
@@ -166,6 +166,7 @@
/obj/structure/closet/ex_act(severity, target)
contents_explosion(severity, target)
new /obj/item/stack/sheet/metal(loc)
dump_contents()
qdel(src)
..()
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+3 -3
View File
@@ -37,9 +37,9 @@
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/module/power_control(src)
new /obj/item/weapon/module/power_control(src)
new /obj/item/weapon/module/power_control(src)
new /obj/item/weapon/electronics/apc(src)
new /obj/item/weapon/electronics/apc(src)
new /obj/item/weapon/electronics/apc(src)
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
code/game/objects/structures/door_assembly.dm
+4 -4
View File
@@ -9,7 +9,7 @@
var/mineral = null
var/typetext = ""
var/icontext = ""
var/obj/item/weapon/airlock_electronics/electronics = null
var/obj/item/weapon/electronics/airlock/electronics = null
var/airlock_type = /obj/machinery/door/airlock //the type path of the airlock once completed
var/glass_type = /obj/machinery/door/airlock/glass
var/created_name = null
@@ -540,7 +540,7 @@
src.state = 0
src.name = "secured airlock assembly"
else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1 )
else if(istype(W, /obj/item/weapon/electronics/airlock) && state == 1 )
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("[user] installs the electronics into the airlock assembly.", \
"<span class='notice'>You start to install electronics into the airlock assembly...</span>")
@@ -568,9 +568,9 @@
user << "<span class='notice'>You remove the airlock electronics.</span>"
src.state = 1
src.name = "wired airlock assembly"
var/obj/item/weapon/airlock_electronics/ae
var/obj/item/weapon/electronics/airlock/ae
if (!electronics)
ae = new/obj/item/weapon/airlock_electronics( src.loc )
ae = new/obj/item/weapon/electronics/airlock( src.loc )
else
ae = electronics
electronics = null
code/game/objects/structures/girders.dm
+1 -1
View File
@@ -239,7 +239,7 @@
qdel(src)
return
if(3.0)
if (prob(15))
if (prob(40))
var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
new remains(loc)
qdel(src)
code/game/objects/structures/grille.dm
+2 -1
View File
@@ -79,7 +79,8 @@
/obj/structure/grille/attack_animal(var/mob/living/simple_animal/M)
M.changeNext_move(CLICK_CD_MELEE)
if(M.melee_damage_upper == 0) return
if(M.melee_damage_upper == 0 || (M.melee_damage_type != BRUTE && M.melee_damage_type != BURN))
return
M.do_attack_animation(src)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
M.visible_message("<span class='warning'>[M] smashes against [src].</span>", \
code/game/objects/structures/janicart.dm
-16
View File
@@ -181,9 +181,6 @@
var/turf/tile = loc
if(isturf(tile))
tile.clean_blood()
if (istype(tile, /turf/simulated/floor))
var/turf/simulated/floor/F = tile
F.dirt = 0
for(var/A in tile)
if(istype(A, /obj/effect))
if(is_cleanable(A))
@@ -238,14 +235,6 @@
step(src, direction)
update_mob()
handle_rotation()
if(istype(src.loc, /turf/simulated))
var/turf/simulated/T = src.loc
if(T.wet == 2) //Lube! Fall off!
playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
buckled_mob.Stun(7)
buckled_mob.Weaken(7)
unbuckle_mob()
step(src, dir)
move_delay = 1
spawn(2)
move_delay = 0
@@ -300,11 +289,6 @@
buckled_mob.pixel_x = -12
buckled_mob.pixel_y = 7
/obj/structure/stool/bed/chair/janicart/bullet_act(obj/item/projectile/Proj)
if(buckled_mob)
buckled_mob.bullet_act(Proj)
/obj/item/key
name = "key"
desc = "A small grey key."
code/game/objects/structures/morgue.dm
+6 -25
View File
@@ -176,10 +176,11 @@ var/global/list/crematoriums = new/list()
for(var/mob/living/M in contents)
if (M.stat!=2)
M.emote("scream")
//Logging for this causes runtimes resulting in the cremator locking up. Commenting it out until that's figured out.
//M.attack_log += "\[[time_stamp()]\] Has been cremated by <b>[user]/[user.ckey]</b>" //No point in this when the mob's about to be deleted
user.attack_log +="\[[time_stamp()]\] Cremated <b>[M]/[M.ckey]</b>"
log_attack("\[[time_stamp()]\] <b>[user]/[user.ckey]</b> cremated <b>[M]/[M.ckey]</b>")
if(user)
user.attack_log +="\[[time_stamp()]\] Cremated <b>[M]/[M.ckey]</b>"
log_attack("\[[time_stamp()]\] <b>[user]/[user.ckey]</b> cremated <b>[M]/[M.ckey]</b>")
else
log_attack("\[[time_stamp()]\] <b>UNKNOWN</b> cremated <b>[M]/[M.ckey]</b>")
M.death(1)
M.ghostize()
qdel(M)
@@ -194,26 +195,6 @@ var/global/list/crematoriums = new/list()
update_icon()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //you horrible people
/*
Crematorium Switch
*/
/obj/machinery/crema_switch/attack_hand(mob/user)
if(src.allowed(usr))
for (var/obj/structure/bodycontainer/crematorium/C in crematoriums)
if (C.id != id)
continue
C.cremate(user)
else
usr << "<span class='danger'>Access denied.</span>"
return
/obj/machinery/crema_switch/attackby(obj/item/W, mob/user, params)
if(W.GetID())
attack_hand(user)
else
return ..()
/*
* Generic Tray
@@ -286,4 +267,4 @@ Crematorium Switch
if(locate(/obj/structure/table) in get_turf(mover))
return 1
else
return 0
return 0
code/game/objects/structures/stool_bed_chair_nest/bed.dm
-2
View File
@@ -24,14 +24,12 @@
/obj/structure/stool/bed/Move(atom/newloc, direct) //Some bed children move
. = ..()
if(buckled_mob)
buckled_mob.buckled = null
if(!buckled_mob.Move(loc, direct))
loc = buckled_mob.loc //we gotta go back
last_move = buckled_mob.last_move
inertia_dir = last_move
buckled_mob.inertia_dir = last_move
. = 0
buckled_mob.buckled = src
/obj/structure/stool/bed/Process_Spacemove(movement_dir = 0)
if(buckled_mob)
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+4 -2
View File
@@ -11,11 +11,13 @@
qdel(src)
return
if(2.0)
if (prob(50))
if (prob(70))
new /obj/item/stack/sheet/metal(loc)
qdel(src)
return
if(3.0)
if (prob(5))
if (prob(50))
new /obj/item/stack/sheet/metal(loc)
qdel(src)
return
return
code/game/objects/structures/windoor_assembly.dm
+3 -3
View File
@@ -19,7 +19,7 @@
dir = NORTH
var/ini_dir
var/obj/item/weapon/airlock_electronics/electronics = null
var/obj/item/weapon/electronics/airlock/electronics = null
var/created_name = null
//Vars to help with the icon's name
@@ -189,7 +189,7 @@
name = "anchored windoor assembly"
//Adding airlock electronics for access. Step 6 complete.
else if(istype(W, /obj/item/weapon/airlock_electronics))
else if(istype(W, /obj/item/weapon/electronics/airlock))
if(!user.drop_item())
return
playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
@@ -219,7 +219,7 @@
return
user << "<span class='notice'>You remove the airlock electronics.</span>"
name = "wired windoor assembly"
var/obj/item/weapon/airlock_electronics/ae
var/obj/item/weapon/electronics/airlock/ae
ae = electronics
electronics = null
ae.loc = loc
code/game/objects/structures/window.dm
+1 -1
View File
@@ -168,7 +168,7 @@
var/mob/living/simple_animal/M = user
M.do_attack_animation(src)
if(M.melee_damage_upper <= 0)
if(M.melee_damage_upper <= 0 || (M.melee_damage_type != BRUTE && M.melee_damage_type != BURN))
return
attack_generic(M, M.melee_damage_upper)