cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

[TGUI] Upgrades Bots (#14871)

Browse Source 
* secbots, ED209s, cleanbots

* Apply suggestions from AA code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* fluid buttons, Restore Safties

* pai rebuild

* deletes all spacing from data list

* katana needs_permit

* lava/storm/boneaxe needs_permit

* check s_store

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
Kyep
2020-11-27 09:56:02 +00:00
committed by GitHub
co-authored by AffectedArc07 Kyep
parent edf4debdeb
commit 4a944658ad
16 changed files with 446 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/toys.dm
+1
View File
@@ -210,6 +210,7 @@
attack_verb = list("attacked", "struck", "hit")
brightness_on = 0
sharp_when_wielded = FALSE // It's a toy
needs_permit = FALSE
/obj/item/twohanded/dualsaber/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
return 0
code/game/objects/items/weapons/twohanded.dm
+3
View File
@@ -208,6 +208,7 @@
name = "bone axe"
desc = "A large, vicious axe crafted out of several sharpened bone plates and crudely tied together. Made of monsters, by killing monsters, for killing monsters."
force_wielded = 23
needs_permit = TRUE
/obj/item/twohanded/fireaxe/boneaxe/update_icon()
icon_state = "bone_axe[wielded]"
@@ -276,6 +277,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
light_power = 2
needs_permit = TRUE
var/brightness_on = 2
var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE)
@@ -385,6 +387,7 @@
var/obj/item/grenade/explosive = null
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
needs_permit = TRUE
var/icon_prefix = "spearglass"
/obj/item/twohanded/spear/update_icon()
code/game/objects/items/weapons/weaponry.dm
+1
View File
@@ -86,6 +86,7 @@
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
needs_permit = TRUE
/obj/item/katana/cursed
slot_flags = null