Commit Graph

99 Commits

Author SHA1 Message Date
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
Fermi ea2d3000d4 Fixed grammar and pointed to correct sprite
Have a nice day.
2019-02-18 23:38:10 +00:00
Fermi ad28d80ecb Fermichem test: Fermiplushie added plus reaction to create
A quick test of the chemistry system to create new reactions. Added FermisPlushie, which is created by reaction (I hope!)
2019-02-18 22:30:59 +00:00
BlackMajor eb0d9ba63b Adds the plushtide. (#7972)
* Plushtide is now

Adds plushies, puts them in arcades and cargo crates. Adjusts cargo crate cost to 1500.

* Small adjustments

Sounds were too quiet, robot misnamed

* Small typo fix

scruppuppy -> scrubpuppy
2019-02-04 00:28:47 -08:00
Cydia c860a797fd Adds a Lamp Plushie
Little lamp plushie, click clack.
2019-01-24 22:28:28 -06:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
Jordan Brown c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
ShizCalev 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
CitadelStationBot f7ade14cf7 [MIRROR] A Nar-Sie Plushie can be used an an extra invoker now! (#5723)
* A Nar-Sie Plushie can be used an an extra invoker now! (#35932)

* A Nar-Sie Plushie can be used an an extra invoker now!

you can't use 9 nar-sie plushies to invoke a rune, nar-sie plushies are only counted once

* Update runes.dm

* Update plushes.dm

* Update plushes.dm

* Update runes.dm

* A Nar-Sie Plushie can be used an an extra invoker now!
2018-02-27 05:03:07 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Trevor Serpas 5d2ddd833a Reduce the volume of the death sound on clock work mobs (#34452)
* Reduce the volume of the death sound on clock work mobs

I edited the .oog since I did not see a way in the code to lower the volume. This will affect all code/game/gamemodes/clock_cult/clock_mobs which at this moment is only maraders and the eminence.

* Non-clockwork mobs are no longer affected

adjusted volume in the code so that the clockwork golems, ratvar, and ratvar plushies are unaffected by the audio file changes
2018-01-19 08:58:29 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
LetterJay dd99e8305a Update plushes.dm 2017-12-03 06:14:14 -06:00
CosmicScientist 7be54897b2 Plushie relationships! 2017-12-02 09:44:02 -06:00
Ashe Higgs 31dfd7e8fb Plush Ratvar can now fight plush Nar-Sie (#32046)
* Plush Ratvar can fight plush Nar-Sie

* Maintainer review

* Qdeleted checks
2017-11-06 14:44:25 -06:00
Ashe Higgs 0c4c4dc1f2 You can now hide grenades in plushies 2017-10-30 14:34:01 -05:00
CitadelStationBot d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot 2c78f7122c [MIRROR] Adds some new plushies (#2866)
* Adds some new plushies

* Update packs.dm
2017-09-22 22:31:07 -05:00
CitadelStationBot 8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847)
* New squeaky datum and plushes

* Update bananashoes.dm
2017-09-22 19:43:56 -05:00