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

Merge branch 'master' of https://github.com/tgstation/-tg-station into Boxes_of_the_Spessmen

Browse Source 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
This commit is contained in:
Incoming
2015-09-27 18:48:57 -04:00
parent 52123f879f 4e90fd62d9
commit 7a4be0e04f
46 changed files with 2056 additions and 1887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+2 -2
View File
@@ -2,7 +2,7 @@
name = "large cardboard box"
desc = "Just a box..."
icon_state = "cardboard"
health = 10 //At the end of the day it's still just a box
health = 10
mob_storage_capacity = 1
burntime = 20
can_weld_shut = 0
@@ -48,4 +48,4 @@
viewing |= M.client
flick_overlay(I,viewing,8)
I.alpha = 0
animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING)
animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING)
code/game/objects/structures/kitchen_spike.dm
+9 -10
View File
@@ -70,9 +70,9 @@
H.buckled = src
H.dir = 2
buckled_mob = H
var/matrix/m120 = matrix(H.transform)
m120.Turn(180)
animate(H, transform = m120, time = 3)
var/matrix/m180 = matrix(H.transform)
m180.Turn(180)
animate(H, transform = m180, time = 3)
H.pixel_y = H.get_standard_pixel_y_offset(180)
return
user << "<span class='danger'>You can't use that on the spike!</span>"
@@ -109,13 +109,12 @@
return
if(!M.buckled)
return
var/mob/living/L = buckled_mob
var/matrix/m120 = matrix(L.transform)
m120.Turn(360)
animate(L, transform = m120, time = 3)
L.pixel_y = L.get_standard_pixel_y_offset(360)
var/matrix/m180 = matrix(M.transform)
m180.Turn(180)
animate(M, transform = m180, time = 3)
M.pixel_y = M.get_standard_pixel_y_offset(180)
M.adjustBruteLoss(30)
src.visible_message(text("<span class='danger'>[M] falls free of the [src]!</span>"))
unbuckle_mob()
L.emote("scream")
L.AdjustWeakened(10)
M.emote("scream")
M.AdjustWeakened(10)