shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge from master

Browse Source
This commit is contained in:
silicons
2020-07-20 10:18:44 -07:00
parent 6ab250dd03 ee8162ea8b
commit 58e26c540c
1206 changed files with 35732 additions and 41410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor/light_floor.dm
+1 -1
View File
@@ -52,7 +52,7 @@
set_light(0)
return ..()
/turf/open/floor/light/attack_hand(mob/user)
/turf/open/floor/light/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
. = ..()
if(.)
return
code/game/turfs/simulated/floor/mineral_floor.dm
+2 -2
View File
@@ -149,7 +149,7 @@
if(!.)
honk()
/turf/open/floor/mineral/bananium/attack_hand(mob/user)
/turf/open/floor/mineral/bananium/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
.=..()
if(!.)
honk()
@@ -202,7 +202,7 @@
if(!.)
radiate()
/turf/open/floor/mineral/uranium/attack_hand(mob/user)
/turf/open/floor/mineral/uranium/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
.=..()
if(!.)
radiate()
code/game/turfs/simulated/floor/reinf_floor.dm
+1 -1
View File
@@ -89,7 +89,7 @@
/turf/open/floor/engine/attack_paw(mob/user)
return attack_hand(user)
/turf/open/floor/engine/attack_hand(mob/user)
/turf/open/floor/engine/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
. = ..()
if(.)
return
code/game/turfs/simulated/wall/mineral_walls.dm
+1 -1
View File
@@ -72,7 +72,7 @@
return
return
/turf/closed/wall/mineral/uranium/attack_hand(mob/user)
/turf/closed/wall/mineral/uranium/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
radiate()
. = ..()
code/game/turfs/simulated/walls.dm
+1 -1
View File
@@ -136,7 +136,7 @@
to_chat(user, text("<span class='notice'>You punch the wall.</span>"))
return TRUE
/turf/closed/wall/attack_hand(mob/user)
/turf/closed/wall/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
. = ..()
if(.)
return