Commit Graph

21603 Commits

Author SHA1 Message Date
Putnam
a9600cffaa Replaces a xor with a power?? 2020-04-21 13:01:50 -07:00
kevinz000
24370db5eb Merge pull request #11930 from Ghommie/Ghommie-cit693
More ToS Compliance.
2020-04-18 19:33:10 -07:00
kevinz000
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
kevinz000
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
kevinz000
5fd862e19d Merge pull request #11860 from Trilbyspaceclone/shields!
Adds more shields and tweaks a few!
2020-04-18 19:32:09 -07:00
Ghom
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
Lin
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
Ghom
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
Ghom
7e57a3410e Merge pull request #11905 from Putnam3145/fix-rads-again
Fixes a divide-by-zero
2020-04-19 00:32:41 +02:00
kappa-sama
2654352d0c tg surgery fixes time 2020-04-18 17:37:19 -04:00
Ghom
bd03d2a362 Merge pull request #11908 from Putnam3145/fix-tactical-destroy
Makes tactical component destroy() work properly.
2020-04-18 13:32:49 +02:00
Ghom
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
Ghom
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
Putnam
d361a8d6ae Makes tactical destroy() work properly. 2020-04-17 22:33:11 -07:00
Ghom
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
Trilbyspaceclone
d26ba86660 Update shields.dm 2020-04-17 23:30:58 -04:00
Ghom
2659459233 web-editor played me a good prank. 2020-04-18 03:48:57 +02:00
Ghom
9c4d10a19c Update code/datums/radiation_wave.dm 2020-04-18 03:48:03 +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
Ghom
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
Ghom
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
Trilbyspaceclone
7756a80beb Merge branch 'master' into shields! 2020-04-17 19:32:39 -04:00
Ghom
86d531890f Merge pull request #11882 from Putnam3145/fix-deleting-objectives
Makes objectives clean theirselves up properly
2020-04-18 01:20:02 +02:00
Lin
7cc7d6884a Merge pull request #11820 from kevinz000/shield_bashing
Shield bashing
2020-04-17 20:45:40 +00:00
kevinz000
1608bd2548 Update shields.dm 2020-04-17 11:57:18 -07:00
Ghom
6a0af190ea I'm a bit busy handling multiple issues. 2020-04-17 20:47:02 +02:00
Ghom
be0409a94a Update toggles.dm 2020-04-17 19:58:57 +02:00
Ghommie
7581d1d5cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit686 2020-04-17 18:37:25 +02:00
Putnam3145
6e8f58d945 Merge pull request #11893 from Citadel-Station-13/Ghommie-patch-3
Once upon a time, a based guardian anchored its name to others' minds.
2020-04-17 09:36:53 -07:00
Ghommie
c5c75c0870 Fixing some more mistakes I did to clothing. 2020-04-17 18:32:11 +02:00
Trilbyspaceclone
0f7bc55755 le sigh 2020-04-17 10:25:48 -04:00
Trilbyspaceclone
8d4782290c Update shields.dm 2020-04-17 10:25:20 -04:00
kevinz000
5b86c334f9 Merge pull request #11863 from Trilbyspaceclone/patch-342
Honey Palm can be distill into mead
2020-04-17 05:51:47 -07:00
kevinz000
7756682362 Merge pull request #11774 from Trilbyspaceclone/tools_andstuff
More mapping Loot tables and code improvements + Maints/Locker loot changes
2020-04-17 05:51:26 -07:00
kevinz000
09f459a369 Merge pull request #11730 from Ghommie/Ghommie-cit667
Minor snowflakes clothing variations refactor. Removal of copypasted states.
2020-04-17 05:49:09 -07:00
kevinz000
3c4c67b6c5 Merge pull request #11869 from necromanceranne/pawnch_updaties
Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes
2020-04-17 05:43:49 -07:00
kevinz000
6a92c47d31 Merge pull request #11870 from Trilbyspaceclone/patch-343
Catnip is no longer a mime plant
2020-04-17 05:42:17 -07:00
kevinz000
4f02c6f3c5 Merge pull request #11875 from Ghommie/Ghommie-cit683
Fixing some dog tier issue.
2020-04-17 05:40:50 -07:00
kevinz000
359790f5af Merge pull request #11876 from Citadel-Station-13/Ghommie-patch-2
Made light bulb/tubes actually use vis_overlays instead of overlays.
2020-04-17 05:40:32 -07:00
kevinz000
e84e6bface Merge pull request #11857 from Trilbyspaceclone/race_drinks
Race drinks!
2020-04-17 05:20:53 -07:00
kevinz000
61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
2020-04-17 05:16:04 -07:00
Ghom
0fb1286042 Update guardian.dm 2020-04-17 08:47:05 +02:00
kevinz000
121b9f0d92 Update ui.dm 2020-04-16 22:57:27 -07:00
kevinz000
ad8c0c2687 Update storage.dm 2020-04-16 22:55:01 -07:00
jjpark-kb
4a38b2870a fix youtool 2020-04-17 01:02:52 -04:00
kappa-sama
21f7a6032d this 2020-04-17 00:50:42 -04:00