Commit Graph

70 Commits

Author SHA1 Message Date
Akrilla
747be9cbe4 Better random plush spawning (#11792)
* better spawning

* check list size

* changes
2020-04-11 01:59:29 +02:00
kevinz000
e76eff6966 Update plushes.dm 2020-02-24 02:21:51 -07:00
kevinz000
27b7cd560c Update plushes.dm 2020-02-24 01:32:04 -07:00
Ghom
93310b8d4f can_random_spawn = FALSE for icon-less plushes 2020-01-23 19:42:21 +01:00
kevinz000
ccf66eb04a bools 2020-01-20 17:59:21 -07:00
kevinz000
7ace9f0203 abstract types 2020-01-10 06:25:23 -08:00
kevinz000
a16a7a7fe0 subtypes 2020-01-10 06:12:03 -08:00
kevinz000
976c725de2 ok fermis stays 2019-12-23 18:32:08 -08:00
kevinz000
fb77d07d52 plushies woohoo 2019-12-23 16:56:43 -08:00
Putnam3145
4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2019-12-05 21:16:47 -08:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie
77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
YakumoChen
5c89447cf9 Update plushes.dm 2019-11-16 09:56:57 +00:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
kevinz000
a16219d97a Merge pull request #9772 from DeltaFire15/weh
Adds eight new plushies to the game while integrating kevs' plush PR
2019-11-12 23:56:01 -07:00
DeltaFire
4d4d495765 Hmm I wonder if anyone would notice if I smuggled another plush into this PR
What it says on the tin, got asked via dms to add another plush to my PR so here we go.
Char is Minty.
2019-11-12 15:32:06 +01:00
DeltaFire
421be859fb Ok nice typo gang 2019-11-11 21:08:32 +01:00
DeltaFire
51aacedb9f Little fix 2019-11-11 18:17:07 +01:00
DeltaFire
3d2986fd06 Fixes the sin plush sprite + MORE PLUSHIES
What it says on the label, fixes the sin plushie sprite as the size was wrong previously and adds two more lizzers

Also fixes a typo weh
2019-11-11 17:32:06 +01:00
DeltaFire
1c6c188033 Exo plush
Adds a AI plushie for exo since this PR is slowly getting filled with plushies
guaranteered non-malf!
2019-11-11 01:05:16 +01:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
DeltaFire
56720ea99c Merging kevinz's plush PR into mine
Adds the kara plushie, the new skylar sprite and the trillby fix into the code, all without any missing syntax elements! Yay!
2019-11-10 22:27:06 +01:00
DeltaFire
7ab4d2f013 Viva la wehvolution
Adding the plushies code after syncing with ros's changes
2019-11-10 17:39:43 +01:00
rosko
cc8423ac45 adds a lizzard plushie
yet another player plushie....this one comes with a real fake maxcap
2019-11-05 20:38:44 +02:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
f725afae64 Random plush spawner tweaks and fixes. 2019-10-29 02:06:22 +01:00
kevinz000
3e9d37e70d Update plushes.dm 2019-09-07 17:13:21 -07:00
kevinz000
b8374feafd Update plushes.dm 2019-09-07 17:03:06 -07:00
TrilbySpaceClone
b2345b19ce critcal 2019-07-12 21:21:52 -04:00
Tupinambis
cc901128c4 Oops I broke descriptions and sounds. Let me fix that. 2019-07-11 18:03:32 -05:00
Tupinambis
8c0c80fc39 Removes references to the character of another underage player. 2019-07-09 00:02:16 -05:00
Tupinambis
0057ac7c5c Removed a plush representing the character of a player that was banned for being underaged. 2019-07-08 22:23:16 -05:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
Ghommie
3e834004ec Ports in bee plushes. 2019-06-18 23:31:09 +02:00
AnalWerewolf
8337692650 Merge branch 'master' into Fritz-cute 2019-06-10 15:15:41 +10:00
AnalWerewolf
4ff12eebd0 he bork and he woof 2019-06-07 18:10:22 +10:00
Sishen
b9b219d561 adds redtail 2019-06-06 16:01:40 -04:00
Sishen
cf3002a392 slimeplush 2019-06-06 05:14:01 -04:00
Trilbyspaceclone
a6e85a63ba Update code/game/objects/items/plushes.dm
Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
2019-05-30 11:14:31 -04:00
Trilbyspaceclone
027ee1e596 Update plushes.dm 2019-05-29 16:40:41 -04:00
Nope
15bd91ecd9 Update plushes.dm 2019-02-27 18:22:25 -06:00
Nope
aaeedd1ffa Adding a plush
burgit fuckin add this reeeeeee /obtuse/
2019-02-26 18:55:08 -06:00
nik707
788b97def5 Merge pull request #8019 from Thalpy/FermiChem
Fermi chem creates a plushie
2019-02-22 02:41:42 -06:00
BlackMajor
1ff058ac50 Whoops 2019-02-20 21:27:31 +13:00
BlackMajor
10244cd3b1 Plushtide 2
More plushies, /random plush spawner.
Some more dumb sounds.
2019-02-20 01:36:38 +13:00
Fermi
2497d0e6e9 I'm blind (Fixed name)
OOPS
2019-02-19 04:31:56 +00:00
Fermi
46af2743f8 Fixed the issue with the sprite!!
Yey!
2019-02-19 00:35:22 +00:00
Fermi
1eddf1a679 Changed name to medcat as per blackmajor's wishes
I don't know how spite animations work too.
2019-02-18 23:56:00 +00:00