cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-05-29 22:20:06 -04:00
committed by GitHub
parent 501f383da4
commit 24c35497ff
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/items/toys/toys.dm
View File

@@ -419,12 +419,7 @@
desc = "A \"Space Life\" brand... wait, what the hell is this thing?"
icon = 'icons/obj/toy.dmi'
icon_state = "nuketoy"
<<<<<<< HEAD
w_class = ITEMSIZE_SMALL //chompstation add because WHY ARE THEY SO BIG
||||||| parent of 32a632bb92... Merge pull request #10488 from VOREStation/upstream-merge-8108
=======
w_class = ITEMSIZE_TINY
>>>>>>> 32a632bb92... Merge pull request #10488 from VOREStation/upstream-merge-8108
var/cooldown = 0
var/toysay = "What the fuck did you do?"
drop_sound = 'sound/items/drop/accessory.ogg'
@@ -1488,4 +1483,4 @@
/obj/structure/balloon/ghost
name = "giant ghost balloon"
desc = "Oh no, it's a ghost! Oh wait, it's just a balloon. Phew!"
icon_state = "ghostballoon"
icon_state = "ghostballoon"