kiwedespars
|
42fac43807
|
Merge branch 'master' into punch-bundle
|
2020-04-19 16:50:01 -07:00 |
|
kiwedespars
|
25e0c47225
|
oops
|
2020-04-19 16:48:37 -07:00 |
|
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 |
|
kiwedespars
|
c3905c8c2b
|
Update uplink_kits.dm
|
2020-04-19 15:56:31 -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
|
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 |
|
Trilbyspaceclone
|
2039fb80e6
|
Update fancy.dm
|
2020-04-18 22:37:05 -04: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
|
8d4a67fedc
|
Makes warm donk pockets cooling after 7 minutes canon again.
|
2020-04-18 15:40:18 +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 |
|
Trilbyspaceclone
|
7756a80beb
|
Merge branch 'master' into shields!
|
2020-04-17 19:32:39 -04:00 |
|
Lin
|
7cc7d6884a
|
Merge pull request #11820 from kevinz000/shield_bashing
Shield bashing
|
2020-04-17 20:45:40 +00: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
|
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
|
61f833b953
|
Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
|
2020-04-17 05:16:04 -07:00 |
|
jjpark-kb
|
4a38b2870a
|
fix youtool
|
2020-04-17 01:02:52 -04:00 |
|
Ghommie
|
2200c690f7
|
configs
|
2020-04-16 18:44:05 +02:00 |
|
Ghommie
|
fe43581d31
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
|
2020-04-16 15:09:52 +02:00 |
|
Artur
|
75dab9fa57
|
And some other fixes
|
2020-04-16 10:51:17 +03:00 |
|
Artur
|
b023a0976b
|
Makes zipties red again
|
2020-04-16 10:10:39 +03:00 |
|
kevinz000
|
e533103ed2
|
Merge branch 'master' into shield_bashing
|
2020-04-15 19:34:08 -07:00 |
|
TrilbySpaceClone
|
4419dc13f5
|
changes and additons
|
2020-04-14 22:17:53 -04:00 |
|
Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05:00 |
|
Ghommie
|
571584901c
|
Custom skin tone preferences.
|
2020-04-14 19:10:28 +02:00 |
|
Trilbyspaceclone
|
34397a5d17
|
Update lootdrop.dm
|
2020-04-14 10:13:23 -04:00 |
|
Trilbyspaceclone
|
2ebf23a32d
|
Update utility_closets.dm
|
2020-04-14 10:12:27 -04:00 |
|
Trilbyspaceclone
|
e7247c6a60
|
Update wallets.dm
|
2020-04-14 10:11:37 -04:00 |
|
Trilbyspaceclone
|
5833ed8029
|
Merge branch 'master' into tools_andstuff
|
2020-04-14 10:10:32 -04:00 |
|
Ghom
|
49e36e47ff
|
Merge pull request #11809 from kevinz000/storage_rework
Adds baystation-style volumetric space storage support
|
2020-04-14 13:17:11 +02:00 |
|
Ghom
|
5d01e05991
|
Merge pull request #11618 from Arturlang/Garlic
Adds garlic, and tweaks bloodsuckers a bunch.
|
2020-04-14 12:38:34 +02:00 |
|
kevinz000
|
5baa5ebf55
|
Merge pull request #11828 from Citadel-Station-13/Ghommie-patch-2
Fixes toilet cistern loot spawning on the floor.
|
2020-04-14 01:35:04 -07:00 |
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|
Putnam
|
1e8fffbf0b
|
Replaced all the extraneous flags with bitflags
|
2020-04-13 16:47:43 -07:00 |
|
Ghommie
|
42ff9b1d35
|
Final test, fixes and parent calls.
|
2020-04-14 01:23:26 +02:00 |
|
Ghommie
|
db43f53ac4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 16:15:40 +02:00 |
|
kevinz000
|
6b6683846b
|
Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
|
2020-04-12 17:02:36 -07:00 |
|
kevinz000
|
8604297dcd
|
Merge pull request #11811 from Ghommie/Ghommie-cit671
Fixes and standarizes a few liver troubles. Re-enables liver failure.
|
2020-04-12 17:01:50 -07:00 |
|
Ghommie
|
05a954f000
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 02:01:01 +02:00 |
|
kevinz000
|
d60932ca5d
|
Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
|
2020-04-12 16:16:37 -07:00 |
|
Ghom
|
863ecf6627
|
Update watercloset.dm
|
2020-04-12 07:17:50 +02:00 |
|
Ghom
|
23b45c9cf3
|
Update lootdrop.dm
|
2020-04-12 06:54:40 +02:00 |
|
Ghom
|
501b4f0e3e
|
Update watercloset.dm
|
2020-04-12 06:42:08 +02:00 |
|
Ghom
|
a96f6238df
|
Merge pull request #10891 from Trilbyspaceclone/more_crates+bags
[Ready]Better crate options
|
2020-04-12 05:48:20 +02:00 |
|
kevinz000
|
6f5c1bac08
|
harmful
|
2020-04-11 08:37:53 -07:00 |
|
kevinz000
|
de296c8879
|
Merge branch 'shield_bashing' of github.com-kevinz000:kevinz000/Citadel-Station-13 into shield_bashing
|
2020-04-11 08:37:30 -07:00 |
|