Commit Graph

19379 Commits

Author SHA1 Message Date
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
CitadelStationBot 96df41d76d Automatic changelog generation for PR #7954 [ci skip] 2019-01-27 02:32:52 -06: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
CitadelStationBot 1e6f497772 Automatic changelog generation for PR #7911 [ci skip] 2019-01-27 02:32:42 -06:00
deathride58 31af02d4e6 makes flashes more effective as a utility item rather than a weapon (#7911) 2019-01-27 00:32:40 -08:00
CitadelStationBot 131fc926b3 Automatic changelog generation for PR #7908 [ci skip] 2019-01-27 02:32:14 -06: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
deathride58 8e48dc5456 moves twilightic's donor item to the neck category in the loadout menu (#7937) 2019-01-27 00:31:29 -08:00
deathride58 4c0d5786d9 Merge pull request #7967 from Citadel-Station-13/kevinz000-patch-15
bandaid fix for bug
2019-01-27 03:27:11 -05: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
CitadelStationBot 2759cc2109 Automatic changelog generation for PR #7964 [ci skip] 2019-01-25 23:05:25 -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 9421535338 Merge pull request #1 from kiwedespars/minor-vog-changes
adds bwoink and snap to vog
2019-01-24 18:52:41 -08: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
CitadelStationBot 2fbe0b84d6 Automatic changelog generation for PR #7945 [ci skip] 2019-01-20 01:53:44 -06:00
deathride58 60b63aa5a3 Merge pull request #7945 from Ghommie/Ghommie-cit2
Fixes a perpetual lack of moisture.
2019-01-20 02:53:42 -05:00
deathride58 1a0682f942 Merge pull request #7934 from Ragolution/PrayToGreatGreenMotherEarth
Pray to great green mother earth
2019-01-20 02:47:23 -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
Ghommie 4bd1af0915 purifies /datum from this filth. 2019-01-19 00:55:15 +01:00
Ghommie 6d51dff3eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit2 2019-01-19 00:28:24 +01:00
Ghommie 4cefeb9ce2 1 2019-01-18 06:54:48 +01: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
BlackMajor 0bf9d758e3 Merge pull request #1 from Citadel-Station-13/master
Just updating my base. Dab.
2019-01-16 19:30:11 +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
CitadelStationBot cbc2af1b4b Automatic changelog generation for PR #7922 [ci skip] 2019-01-14 22:24:24 -06: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
CitadelStationBot 1816577ac8 Automatic changelog generation for PR #7923 [ci skip] 2019-01-14 22:24:10 -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
CitadelStationBot 4147b5767c Automatic changelog generation for PR #7912 [ci skip] 2019-01-14 22:23:31 -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
CitadelStationBot 0ed4591e84 Automatic changelog generation for PR #7916 [ci skip] 2019-01-14 22:22:19 -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
CitadelStationBot 94304200b2 Automatic changelog generation for PR #7918 [ci skip] 2019-01-14 22:22:02 -06:00