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

Fixes master

Browse Source
This commit is contained in:
oranges
2017-10-01 00:52:23 -05:00
committed by CitadelStationBot
parent 0cc54029e2
commit 2e0513bb50
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/cult_structures.dm
+11
View File
@@ -107,8 +107,19 @@
pickedtype = /obj/item/clothing/suit/hooded/cultrobes/cult_shield pickedtype = /obj/item/clothing/suit/hooded/cultrobes/cult_shield
if("Flagellant's Robe") if("Flagellant's Robe")
pickedtype = /obj/item/clothing/suit/hooded/cultrobes/berserker pickedtype = /obj/item/clothing/suit/hooded/cultrobes/berserker
<<<<<<< HEAD
if("Nar-Sien Hardsuit") if("Nar-Sien Hardsuit")
pickedtype = /obj/item/clothing/suit/space/hardsuit/cult pickedtype = /obj/item/clothing/suit/space/hardsuit/cult
=======
if("Bastard Sword")
if((world.time - SSticker.round_start_time) >= 12000)
pickedtype = /obj/item/twohanded/required/cult_bastard
else
cooldowntime = 12000 - (world.time - SSticker.round_start_time)
to_chat(user, "<span class='cultitalic'>The forge fires are not yet hot enough for this weapon, give it another [DisplayTimeText(cooldowntime)].</span>")
cooldowntime = 0
return
>>>>>>> e997bc4... Merge pull request #31198 from Jordie0608/apparentlythisbuildcompletedthefirsttimeidkhow
if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time) if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)
cooldowntime = world.time + 2400 cooldowntime = world.time + 2400
var/obj/item/N = new pickedtype(get_turf(src)) var/obj/item/N = new pickedtype(get_turf(src))