Commit Graph
1235 Commits
Author SHA1 Message Date
kevinz000 31f9ed9665 fixes 2019-10-24 15:31:45 -07:00
kevinz000 f96e1bbe33 lmao 2019-10-22 01:59:45 -07:00
kevinz000 95b81b5938 fix 2019-10-21 00:55:15 -07:00
kevinz000 c6c2a703e5 Merge remote-tracking branch 'origin/master' into magrifles_again 2019-10-21 00:47:03 -07:00
kevinz000andGitHub c59f15a8bc Merge pull request #9529 from BlackMajor/Yeet
Syndicate paper masks no longer work in pockets
2019-10-19 19:53:40 -07:00
BlackMajor d39897b9ad Update phantomthief.dm 2019-10-18 23:34:31 +13:00
kevinz000andGitHub 5e049bc64a Merge pull request #9514 from Linzolle/kevin-has-a-foot-fetish
foot fetish content for kevin (ankle coverings)
2019-10-17 12:49:08 -07:00
kevinz000andGitHub a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements
Vore fixes and optimizations
2019-10-17 12:48:01 -07:00
Linzolle 1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
kevinz000andGitHub 994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
2019-10-16 12:44:34 -07:00
BlackMajorandGitHub e8649e5c3c Merge pull request #9506 from izzyinbox/bark
Adds *bark emote
2019-10-16 21:00:15 +13:00
kevinz000andGitHub 11a93d41de Merge pull request #9499 from r4d6/patch-1
Add a Blindfold to the loadout list
2019-10-15 22:57:02 -07:00
izzyinbox 7a91bb4cd3 Adds *bark emote 2019-10-15 10:24:08 -05:00
deathride58andGitHub 9fd4e7f673 Merge pull request #9472 from Thalpy/Quickfixforfood
[speedmerge] Quickfixforfood and fixes the chem hindenburg
2019-10-15 06:32:59 -04:00
deathride58andGitHub 26d4a2d943 Merge pull request #9493 from Ghommie/Ghommie-cit234
SDGF ghost poll message made terse, other tweaks.
2019-10-15 06:27:58 -04:00
Poojawa d5d878e93e moved the values up 2019-10-15 04:09:46 -05:00
Poojawa ff21b992ad Move files and tweaks vore panel stuff 2019-10-15 03:35:00 -05:00
r4d6andGitHub a824998b89 Add a Blindfold to the loadout list 2019-10-14 11:48:14 -04:00
Ghommie 321c30cf89 now with 51% more loads. 2019-10-14 06:24:54 +02:00
Ghommie 3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02:00
Jay 02b78a2817 changes donator item from glasses to a hat 2019-10-13 17:47:11 -05:00
Thalpy 06599523a9 Ghommie is a saint 2019-10-13 22:06:57 +01:00
Thalpy 3b8ea30d9b I did it 2019-10-12 20:06:46 +01:00
Thalpy f6796b93b3 Fixes graft 2019-10-12 18:22:48 +01:00
FermiandFermi 2e03985696 aaaa 2019-10-12 07:55:19 +01:00
kevinz000andGitHub a9dcf681ce Merge pull request #9457 from Ghommie/Ghommie-cit227
Fixing a runtime when examining unloaded cit hyposprays.
2019-10-11 12:16:50 -07:00
kevinz000andGitHub 2e74833e72 Merge pull request #9444 from Thalpy/Updates-holder
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
2019-10-11 12:08:12 -07:00
Ghommie 26e6ba9686 Fixing a runtime when examining unloaded cit hyposprays. 2019-10-09 18:34:54 +02:00
FermiandFermi ad0f34cdf8 Tweaks wiki a lil 2019-10-09 06:04:06 +01:00
Ghommie 735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
FermiandFermi bc118d5ead Merge branch 'master' into Updates-holder 2019-10-08 12:21:56 +01:00
FermiandFermi b8c87a5f40 Spicy 2019-10-08 12:05:06 +01:00
kevinz000andGitHub 922e9849bd Merge pull request #9391 from GrayRachnid/rebalancesk9borgs
Rebalances k9borg pounce/bite around the secborg's baton.
2019-10-08 00:36:26 -07:00
ThalpyandGitHub 564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
kevinz000andGitHub 0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
nik707andGitHub 6803338df2 Merge pull request #9384 from jakeramsay007/Moar-Bugfixes
Fixes the Trek uniform/suit sprites
2019-10-07 18:19:59 -05:00
ThalpyandGitHub 27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
kevinz000andGitHub 356755d710 Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
2019-10-05 08:26:40 -07:00
FermiandFermi 2abd15c7e7 Incase someone speedmerges 2019-10-04 04:48:34 +01:00
GrayRachnid 7d579e6a0f Removed cell charge on bite. 2019-10-03 23:33:38 -04:00
GrayRachnid 211e7a2c60 removes charge from small jaws. Reduces big jaws charge to 250. Adds a thingy so they don't run out. removes misleading comments. 2019-10-03 23:05:38 -04:00
FermiandFermi d1c381cad3 lye down 2019-10-04 03:27:30 +01:00
FermiandFermi 10f5fc3b47 Buffer fix 2019-10-04 03:22:53 +01:00
Jay 70cbd8c1ca fixes bad icon path 2019-10-02 22:11:42 -05:00
GrayRachnid ad9ddcb6da Reduces cell charge to 750, spoolup time to 1 and reduces self-stun if missed. 2019-10-02 19:30:23 -04:00
GrayRachnid e24c2ac249 Rebalances dogborg pounce/bite around the secborg's harmbaton. 2019-10-02 14:56:32 -04:00
Chayse Ramsay 68ca8a5ac0 whoops 2019-10-02 11:55:38 +01:00
FermiandFermi 89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
Jay e0b8d28386 donator item 2019-09-30 22:16:27 -05:00