Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
This commit is contained in:
kevinz000
2017-08-24 21:07:58 -07:00
committed by GitHub
parent 188193eb61
commit c638386507
219 changed files with 40493 additions and 56328 deletions
+3 -5
View File
@@ -115,8 +115,6 @@
name = "synthesized banana peel"
desc = "A synthetic banana peel."
/obj/item/grown/bananapeel/specialpeel/Crossed(AM)
if(iscarbon(AM))
var/mob/living/carbon/carbon = AM
if(carbon.slip(40, src, FALSE))
qdel(src)
/obj/item/grown/bananapeel/specialpeel/Initialize(AM)
. = ..()
AddComponent(/datum/component/slippery, 40)