Commit Graph

12000 Commits

Author SHA1 Message Date
Tupinambis e5e97302d4 Adds a new security level: Amber (#7976)
* Adds the Amber security level.

* This isn't C
2019-02-05 17:53:58 -08: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
Trilbyspaceclone dab1591bca Update drinks_recipes.dm (#7962) 2019-01-27 00:35:43 -08:00
Trilbyspaceclone fa34212e60 [Ready] Fixes mute trait (#7959)
* Fuck it lets not have the trait broken

* Update negative.dm

* Update negative.dm

* Update negative.dm
2019-01-27 00:35:16 -08:00
Trilbyspaceclone b8043dc807 [Ready] Buffs Cayenne the carp (#7956)
* buffs Cayenne the carp

* woops >_<
2019-01-27 00:34:56 -08:00
Trilbyspaceclone 14b873c9aa [Ready] Fixes power tool drill fitting in boots/wallet (#7958)
* Update wallets.dm

* Makes sure boots cant do it
2019-01-27 00:34:36 -08:00
deathride58 5b43a2dba3 Janitor powercreep - buffs mops by axing the delay on their cleaning (#7954)
* janitor powercreep - heavily buffs mops

* nerfs mops by making them use up stamina. standard mop takes 5 stamina per tile mopped, advanced mop takes 2 stamina

* fixes travis
2019-01-27 00:32:50 -08:00
deathride58 31af02d4e6 makes flashes more effective as a utility item rather than a weapon (#7911) 2019-01-27 00:32:40 -08:00
deathride58 fa1693a291 adds the player's character name to the new player panel so that people quit joining in as the wrong character (#7908) 2019-01-27 00:32:13 -08:00
kevinz000 67d9dd4a82 Update effect_system.dm 2019-01-27 00:09:24 -08:00
nik707 55b622c148 Merge pull request #7961 from Citadel-Station-13/kevinz000-patch-5
tgs3 sdql2 command is slightly more useful but still pretty damn useless
2019-01-26 23:45:46 -06:00
nik707 b7ab4a5bb6 Merge pull request #7963 from kiwedespars/master
adds bwoinking and snapping to vog.
2019-01-26 23:45:21 -06:00
deathride58 a81474a786 Merge pull request #7964 from CydiaButt13/lampstuff
Adds a Lamp Plushie
2019-01-26 00:05:21 -05:00
Cydia c860a797fd Adds a Lamp Plushie
Little lamp plushie, click clack.
2019-01-24 22:28:28 -06:00
kiwedespars a876e985e7 adds bwoink and snap to vog
this isn't needed
adds heyo to orgasm words too.

however, man once thought of something really stupid, and man's contributor didn't want to do it, so man made it happen
2019-01-24 18:41:42 -08:00
kevinz000 beab8047b9 Update chat_commands.dm 2019-01-23 23:59:07 -08:00
deathride58 b9d5beeefd Merge pull request #7932 from Trilbyspaceclone/racec
[Ready] Adds the abilty to make 3 lesser race tonics
2019-01-21 19:47:48 -05:00
deathride58 6719cf4b52 Merge pull request #7924 from Trilbyspaceclone/paperwork
[Ready] Makes paper work for cargo to do for spare credits!
2019-01-21 19:46:58 -05:00
deathride58 007646d55e Merge pull request #7917 from Trilbyspaceclone/Ailurophobia
[Ready] Adds new Ailurophobia phobia!
2019-01-21 19:46:06 -05:00
deathride58 2cd500de04 Merge pull request #7925 from Citadel-Station-13/kevinz000-patch-15
Radioactive Teleport Armor - Everyone Dies Edition
2019-01-21 19:45:51 -05:00
Trilbyspaceclone da7dbe6204 Update packs.dm 2019-01-20 17:34:15 -05:00
deathride58 2b852a4dec Update code/modules/crafting/recipes.dm
Finnnnneeeee

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-01-20 17:32:56 -05:00
deathride58 08601b75f6 Merge pull request #7939 from Citadel-Station-13/kevinz000-patch-5
Disables crayon powder coloring mobs
2019-01-20 02:46:56 -05:00
deathride58 22bc4a33f9 Merge pull request #7940 from Citadel-Station-13/kevinz000-patch-13
Removes heirloom toolbox extra damage
2019-01-20 02:46:40 -05:00
deathride58 4aaa4e6490 Merge pull request #7941 from BlackMajor/Shotgun-gay
You know the compact shotgun should probably actually be compact.
2019-01-20 02:46:19 -05:00
Jacie Thorpe ffb13d4a03 Removed Picking Zombie from Magic Mirror (#7942) 2019-01-19 15:24:45 -08:00
BlackMajor 454f672e34 Why isn't the compact shotgun compact
-Changes the wardens compact combat shotgun to fit in backpacks.

No really, a sawed off riot shotgun fits in a backpack and holds more ammo. Any Warden worth their salt just swaps shotguns, you'd think a "Compact" shotgun would be able to fit much the same considering the lower ammo count.
2019-01-16 19:54:58 +13:00
kevinz000 651741f6f9 Update toolbox.dm 2019-01-15 19:56:47 -08:00
kevinz000 93acbf0a1d Update other_reagents.dm 2019-01-15 19:51:08 -08:00
nik707 4c8b2cfd7b Merge pull request #7922 from deathride58/fixesmajorgamebreakingbug
fixes a very major bug that makes the game extremely unplayable
2019-01-14 22:24:22 -06:00
nik707 18230a1d49 Merge pull request #7923 from deathride58/backpackjiggle
Goon-esque backpack animations - makes storage items jiggle and squish when you interact with them
2019-01-14 22:24:08 -06:00
nik707 c639273e9a Merge pull request #7912 from deathride58/configtagline
Makes the server tagline a config option
2019-01-14 22:23:29 -06:00
nik707 b06096abfd Merge pull request #7916 from deathride58/altclicktoopenstorageport
Ports tgstation/tgstation#41712 - Open storage by alt clicking
2019-01-14 22:22:17 -06:00
nik707 05c8edd882 Merge pull request #7918 from deathride58/goonstyleattackanims
Adds slight rotation to attack animations (Similar to Goon)
2019-01-14 22:22:00 -06:00
nik707 62b177ea7c Merge pull request #7919 from deathride58/animatedthrows
fancy throws - makes throws perform the attack animation and play a sound
2019-01-14 22:21:43 -06:00
nik707 aaa3b02b25 Merge pull request #7920 from deathride58/noisyflashlights
noisy flashlights - makes flashlights play a sound when toggled
2019-01-14 22:21:21 -06:00
nik707 a01f949623 Merge pull request #7921 from deathride58/fancierdisposalnoises
Immersive disposals - Things in disposals will now make sounds when hitting corners
2019-01-14 22:21:03 -06:00
deathride58 579a729a02 Merge pull request #7930 from Citadel-Station-13/nik707-patch-1
Completely tested and working TEG nerf
2019-01-14 22:09:43 -05:00
deathride58 282dabc498 Merge pull request #7928 from Citadel-Station-13/kevinz000-patch-19
Fixes an edge case regarding mind initialization firing while being gibbed by an explosion
2019-01-14 22:04:02 -05:00
deathride58 0a8e288ae0 Merge pull request #7914 from Ghommie/Ghommie-cit1
Minor reagent_containers clean up on hydroitemdefines.dm
2019-01-14 21:52:02 -05:00
deathride58 dab87b1b43 Merge pull request #7909 from Trilbyspaceclone/patch-46
[Ready] Makes engivender more usefull and adds a few more coin items
2019-01-14 21:48:50 -05:00
deathride58 a877e796d4 Merge pull request #7890 from Ragolution/endrapen
Suicide Messages, Combat Messages, Uniforms Recovered
2019-01-14 21:39:02 -05:00
deathride58 5ebc570c7a Merge pull request #7888 from Citadel-Station-13/kevinz000-patch-5
Reworks ephedrine
2019-01-14 21:37:45 -05:00
deathride58 9047538620 Merge pull request #7884 from Citadel-Station-13/kevinz000-patch-13
Readds drones
2019-01-14 21:36:37 -05:00
Trilbyspaceclone a6d825ae4a Update traumas.dm 2019-01-13 13:44:18 -05:00
Trilbyspaceclone 910c79efdf sure thing 2019-01-13 13:27:14 -05:00
Trilbyspaceclone d4b6da5d6e Update others.dm 2019-01-13 12:16:25 -05:00
nik707 f5382b4ff6 absolutely tested 2019-01-13 02:04:46 -06:00
Trilbyspaceclone 913de53760 Update engivend.dm 2019-01-13 01:42:11 -05:00
Trilbyspaceclone 6d9c76ce3a Update engivend.dm 2019-01-13 01:31:20 -05:00