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

baseball bat

Browse Source
This commit is contained in:
Sishen
2019-09-04 03:01:47 -04:00
parent 3f954f10a7
commit d431ee1a20
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/holy_weapons.dm
+2 -1
View File
@@ -251,7 +251,8 @@
var/list/holy_weapons_list = typesof(/obj/item/nullrod) + list( var/list/holy_weapons_list = typesof(/obj/item/nullrod) + list(
/obj/item/twohanded/dualsaber/hypereutactic/chaplain, /obj/item/twohanded/dualsaber/hypereutactic/chaplain,
/obj/item/gun/energy/laser/redtag/hitscan/chaplain, /obj/item/gun/energy/laser/redtag/hitscan/chaplain,
/obj/item/multitool/chaplain /obj/item/multitool/chaplain,
/obj/item/melee/baseball_bat/chaplain
) )
var/list/display_names = list() var/list/display_names = list()
for(var/V in holy_weapons_list) for(var/V in holy_weapons_list)
code/game/objects/items/weaponry.dm
+13
View File
@@ -513,6 +513,19 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
var/homerun_able = 0 var/homerun_able = 0
total_mass = 2.7 //a regular wooden major league baseball bat weighs somewhere between 2 to 3.4 pounds, according to google total_mass = 2.7 //a regular wooden major league baseball bat weighs somewhere between 2 to 3.4 pounds, according to google
/obj/item/melee/baseball_bat/chaplain
name = "blessed baseball bat"
desc = "There ain't a cult in the league that can withstand a swatter."
force = 14
throwforce = 14
obj_flags = UNIQUE_RENAME
var/chaplain_spawnable = TRUE
total_mass = TOTAL_MASS_MEDIEVAL_WEAPON
/obj/item/melee/baseball_bat/chaplain/Initialize()
. = ..()
AddComponent(/datum/component/anti_magic, TRUE, TRUE)
/obj/item/melee/baseball_bat/homerun /obj/item/melee/baseball_bat/homerun
name = "home run bat" name = "home run bat"
desc = "This thing looks dangerous... Dangerously good at baseball, that is." desc = "This thing looks dangerous... Dangerously good at baseball, that is."