Commit Graph
33173 Commits
Author SHA1 Message Date
Winter Flare dc5c8fb657 Ups Crab Meat from 1 to 4 2020-04-19 17:00:48 -04:00
CitadelStationBotandGitHub 22dd41925f Merge pull request #11937 from Citadel-Station-13/Ghommie-patch-3
Fixing critter crates having an invalid icon state when opened.
2020-04-19 15:11:28 -05:00
LinandGitHub 88b5ca72b7 Merge pull request #11906 from Citadel-Station-13/Ghommie-patch-2
Fixing Forensic scanners not reading blood DNA.
2020-04-19 16:53:54 +00:00
LinandGitHub d75e3f79bd Merge pull request #11917 from Ghommie/Ghommie-cit688
Makes warm donk pockets cooling after 7 minutes canon again.
2020-04-19 16:52:33 +00:00
GhomandGitHub 8551998833 Update critter.dm 2020-04-19 14:07:13 +02:00
kevinz000andGitHub 792af56b67 Update riding.dm 2020-04-19 00:48:51 -07:00
GhomandGitHub f714403d6e Merge pull request #11895 from Seris02/piggybackfix
fixes piggyback merging
2020-04-19 04:56:04 +02:00
GhomandGitHub ddf0480ec9 Merge pull request #11933 from Trilbyspaceclone/patch-348
Ports TG#50091 - Fixes rolling paper by nemvar
2020-04-19 04:54:09 +02:00
TrilbyspacecloneandGitHub 2039fb80e6 Update fancy.dm 2020-04-18 22:37:05 -04:00
kevinz000andGitHub 24370db5eb Merge pull request #11930 from Ghommie/Ghommie-cit693
More ToS Compliance.
2020-04-18 19:33:10 -07:00
kevinz000andGitHub ab01d91971 Merge pull request #11903 from Ghommie/Ghommie-cit687
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 19:32:50 -07:00
kevinz000andGitHub b65ad491b4 Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2
Revert "Makes so turning in place updates riders when riding someone's back"
2020-04-18 19:32:34 -07:00
kevinz000andGitHub 5fd862e19d Merge pull request #11860 from Trilbyspaceclone/shields!
Adds more shields and tweaks a few!
2020-04-18 19:32:09 -07:00
GhomandGitHub b08ad2dd2b Merge pull request #11907 from Linzolle/ripicon
fix ripley construction icon
2020-04-19 03:40:27 +02:00
GhomandGitHub e8b5ebecc3 Merge pull request #11911 from kevinz000/compression
Compresses synthesized instruments and .. vore.
2020-04-19 03:26:19 +02:00
GhomandGitHub 6e62f7a2a3 Merge pull request #11878 from Arturlang/fixes_zipties_being_red
Makes zipties white again
2020-04-19 02:45:31 +02:00
Ghommie 39aef14924 More ToS Compliance. 2020-04-19 02:40:58 +02:00
LinandGitHub 8d8a0b0f45 Merge pull request #11899 from Ghommie/Ghommie-cit686
Fixing some more mistakes I did to clothing.
2020-04-19 00:24:29 +00:00
Changelogs 877c912dc1 Automatic changelog compile [ci skip] 2020-04-19 00:04:27 +00:00
GhomandGitHub 998b199dba Merge pull request #11927 from kappa-sama/patch-22
ports tg's fix to instant surgery closing
2020-04-19 01:21:23 +02:00
GhomandGitHub 7e57a3410e Merge pull request #11905 from Putnam3145/fix-rads-again
Fixes a divide-by-zero
2020-04-19 00:32:41 +02:00
kappa-samaandGitHub 2654352d0c tg surgery fixes time 2020-04-18 17:37:19 -04:00
Ghommie 8d4a67fedc Makes warm donk pockets cooling after 7 minutes canon again. 2020-04-18 15:40:18 +02:00
GhomandGitHub bd03d2a362 Merge pull request #11908 from Putnam3145/fix-tactical-destroy
Makes tactical component destroy() work properly.
2020-04-18 13:32:49 +02:00
GhomandGitHub 6d50b5daf0 Merge pull request #11887 from Citadel-Station-13/kevinz000-patch-1
storage boxes now have clickdrag passthrough
2020-04-18 13:28:38 +02:00
GhomandGitHub 9b981d0749 Merge pull request #11888 from Citadel-Station-13/kevinz000-patch-9
fixes closer extending too many rows up
2020-04-18 13:28:34 +02:00
Artur bbd038bba6 Ghommies suggestion 2020-04-18 14:06:38 +03:00
kevinz000 320c33e375 Vore compression 2020-04-18 01:46:59 -07:00
kevinz000 18b9d1cc16 Sound compression 2020-04-18 01:39:50 -07:00
Putnam d361a8d6ae Makes tactical destroy() work properly. 2020-04-17 22:33:11 -07:00
GhomandGitHub 64647318df Merge pull request #11883 from Putnam3145/fix-dynamic-on-by-default
Makes dynamic voting not the default
2020-04-18 05:47:21 +02:00
GhomandGitHub 50ee5b9de5 Merge pull request #11885 from kappa-sama/patch-21
ports "Makes visible(based on sight) messages always appear to mobs in range of 1 despite in darkness"
2020-04-18 05:44:53 +02:00
GhomandGitHub 775948eed3 Merge pull request #11866 from Citadel-Station-13/kevinz000-patch-6
Shuffles around and buffs resisting embedded objects
2020-04-18 05:34:58 +02:00
TrilbyspacecloneandGitHub d26ba86660 Update shields.dm 2020-04-17 23:30:58 -04:00
Linzolle 425fc0c736 fix ripley icon 2020-04-17 21:55:43 -05:00
GhomandGitHub 2659459233 web-editor played me a good prank. 2020-04-18 03:48:57 +02:00
GhomandGitHub 9c4d10a19c Update code/datums/radiation_wave.dm 2020-04-18 03:48:03 +02:00
GhomandGitHub 3188ef3475 Whops 2020-04-18 03:32:54 +02:00
GhomandGitHub cf505f900a Update atoms.dm 2020-04-18 03:29:45 +02:00
Putnam cbc02a8f0b fixes a divide-by-zero whoops 2020-04-17 18:28:15 -07:00
Ghommie ac662a46c1 Extra support for bussed/lateloaded holodeck maps. 2020-04-18 03:15:05 +02:00
GhomandGitHub 2676d663d6 Revert "Makes so turning in place updates riders when riding someone's back" 2020-04-18 03:09:49 +02:00
Ghommie 523672b6a5 fix for my relatively minuscule backend refactor for holodeck. 2020-04-18 02:32:10 +02:00
CitadelStationBot 0e55de55a7 Automatic changelog generation for PR #11871 [ci skip] 2020-04-17 19:07:31 -05:00
GhomandGitHub 6da088f4ea Merge pull request #11871 from kappa-sama/patch-20
minor nerf to aranesp's stamina regen
2020-04-18 02:07:28 +02:00
CitadelStationBot 662f98cab7 Automatic changelog generation for PR #11900 [ci skip] 2020-04-17 18:36:53 -05:00
GhomandGitHub 3ecbf2dc46 Merge pull request #11900 from kappa-sama/patch-22
reverts #11880
2020-04-18 01:36:50 +02:00
TrilbyspacecloneandGitHub 7756a80beb Merge branch 'master' into shields! 2020-04-17 19:32:39 -04:00
CitadelStationBot 77af88da8c Automatic changelog generation for PR #11882 [ci skip] 2020-04-17 18:20:06 -05:00
GhomandGitHub 86d531890f Merge pull request #11882 from Putnam3145/fix-deleting-objectives
Makes objectives clean theirselves up properly
2020-04-18 01:20:02 +02:00