fixes the map, adds subtype of martial art

This commit is contained in:
timothyteakettle
2020-03-29 00:46:18 +00:00
parent 818d7b2ebf
commit 5afe5aab3f
2 changed files with 17 additions and 12 deletions
+10 -12
View File
@@ -18203,8 +18203,10 @@
/turf/open/floor/plasteel/freezer,
/area/syndicate_mothership)
"Vk" = (
/obj/structure/table,
/obj/item/storage/belt/champion/wrestling/holodeck,
/turf/open/floor/holofloor/wood,
/area/holodeck)
/area/holodeck/rec_center/wrestlingarena)
"Vt" = (
/obj/item/paper/fluff/stations/centcom/disk_memo,
/obj/structure/noticeboard{
@@ -18369,10 +18371,6 @@
},
/turf/open/indestructible/hotelwood,
/area/centcom/holding)
"Wx" = (
/obj/item/storage/belt/champion/wrestling,
/turf/open/floor/holofloor/wood,
/area/holodeck/rec_center/wrestlingarena)
"Wz" = (
/obj/structure/table,
/obj/item/storage/backpack/duffelbag/med/surgery,
@@ -72474,6 +72472,7 @@ aa
aa
aa
bj
Vk
YC
YC
YC
@@ -72482,8 +72481,7 @@ YC
YC
YC
YC
YC
YC
Vk
fx
aa
aa
@@ -72731,16 +72729,16 @@ aa
aa
aa
bj
YC
Wx
Vk
YC
YC
YC
YC
YC
Wx
YC
YC
YC
Vk
fx
aa
aa
@@ -72988,6 +72986,7 @@ aa
aa
aa
bj
Vk
YC
YC
YC
@@ -72996,8 +72995,7 @@ YC
YC
YC
YC
YC
YC
Vk
fx
aa
aa
+7
View File
@@ -446,6 +446,9 @@
..()
/datum/martial_art/wrestling/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(A.mind.martial_art == /datum/martial_art/wrestling/holodeck && D.mind.martial_art != /datum/martial_art/wrestling/holodeck)
A.visible_message("You cannot put someone into a cinch unless they are wearing a wrestling belt!")
return FALSE
if(check_streak(A,D))
return 1
if(A.pulling == D || A == D) // don't stun grab yoursel
@@ -461,6 +464,10 @@
name = "Wrestling Belt"
var/datum/martial_art/wrestling/style = new
/obj/item/storage/belt/champion/wrestling/holodeck
name = "Holodeck Wrestling Belt"
var/datum/martial_art/wrestling/holodeck/style = new
/obj/item/storage/belt/champion/wrestling/equipped(mob/user, slot)
if(!ishuman(user))
return