cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5857 from Novacat/nova-basicfixes

Browse Source 
Emergency Hotfix 2
This commit is contained in:
Novacat
2019-09-14 02:58:56 -04:00
committed by GitHub
parent f0f8697b2c d4b70dd33d
commit fa601b4672
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+4
View File
@@ -573,6 +573,10 @@
M.update_inv_shoes()
return ..()
/obj/item/clothing/shoes/clean_blood()
update_icon()
return ..()
/obj/item/clothing/shoes/proc/handle_movement(var/turf/walking, var/running)
if(prob(1) && !recent_squish) //VOREStation edit begin
recent_squish = 1
maps/tether/tether-05-station1.dmm
+9 -9
View File
@@ -1324,7 +1324,7 @@
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
dir = 8;
id = "cafe";
id = "cafe2";
layer = 3.1;
name = "Cafe Shutters"
},
@@ -1738,7 +1738,7 @@
/obj/item/weapon/reagent_containers/glass/rag,
/obj/machinery/door/blast/shutters{
dir = 2;
id = "cafe";
id = "cafe2";
layer = 3.1;
name = "Cafe Shutters"
},
@@ -1754,7 +1754,7 @@
/obj/machinery/chemical_dispenser/bar_coffee/full,
/obj/machinery/button/remote/blast_door{
desc = "A remote control-switch for shutters.";
id = "cafe";
id = "cafe2";
name = "Cafe Shutters";
pixel_x = -10;
pixel_y = 36;
@@ -6683,7 +6683,7 @@
},
/obj/machinery/door/blast/shutters{
dir = 2;
id = "cafe";
id = "cafe2";
layer = 3.1;
name = "Cafe Shutters"
},
@@ -6792,7 +6792,7 @@
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
dir = 4;
id = "cafe";
id = "cafe2";
layer = 3.1;
name = "Cafe Shutters"
},
@@ -6843,7 +6843,7 @@
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
dir = 2;
id = "cafe";
id = "cafe2";
layer = 3.1;
name = "Cafe Shutters"
},
@@ -6978,7 +6978,7 @@
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
dir = 8;
id = "cafe";
id = "cafe2";
layer = 3.1;
name = "Cafe Shutters"
},
@@ -6989,7 +6989,7 @@
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
dir = 4;
id = "cafe";
id = "cafe2";
layer = 3.1;
name = "Cafe Shutters"
},
@@ -7003,7 +7003,7 @@
"amF" = (
/obj/machinery/door/blast/shutters{
dir = 2;
id = "cafe";
id = "cafe2";
layer = 3.1;
name = "Cafe Shutters"
},