kevinz000
|
ae27bf90e4
|
Merge pull request #11846 from Putnam3145/vore-optimization
Optimizing vore + commenting out simplemob vore (sorry)
|
2020-04-19 16:45:44 -07:00 |
|
CitadelStationBot
|
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 |
|
Lin
|
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 |
|
Lin
|
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 |
|
Ghom
|
8551998833
|
Update critter.dm
|
2020-04-19 14:07:13 +02:00 |
|
kevinz000
|
792af56b67
|
Update riding.dm
|
2020-04-19 00:48:51 -07:00 |
|
Ghom
|
f714403d6e
|
Merge pull request #11895 from Seris02/piggybackfix
fixes piggyback merging
|
2020-04-19 04:56:04 +02:00 |
|
Trilbyspaceclone
|
2039fb80e6
|
Update fancy.dm
|
2020-04-18 22:37:05 -04: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 |
|
Ghommie
|
8d4a67fedc
|
Makes warm donk pockets cooling after 7 minutes canon again.
|
2020-04-18 15:40:18 +02: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 |
|
Putnam
|
33039f9962
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization
|
2020-04-17 18:56:26 -07: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
|
c8ce60c856
|
Added back some vore default modes.
|
2020-04-17 18:46:09 -07:00 |
|
Ghom
|
3188ef3475
|
Whops
|
2020-04-18 03:32:54 +02:00 |
|
Ghom
|
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 |
|
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 |
|
Putnam
|
761b3907e3
|
Makes vore noises, enlargement opt-in
|
2020-04-17 09:10:08 -07: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 |
|