 TrilbySpaceClone
|
8ca7bb7535
|
Right...
|
2020-04-18 09:46:56 -04: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 |
|
|
Ghommie
|
96b64009d0
|
Oh, nullspace.
|
2020-04-18 03:44:49 +02: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 |
|
|
Ghommie
|
ac662a46c1
|
Extra support for bussed/lateloaded holodeck maps.
|
2020-04-18 03:15:05 +02:00 |
|
|
Ghommie
|
523672b6a5
|
fix for my relatively minuscule backend refactor for holodeck.
|
2020-04-18 02:32:10 +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 |
|
|
Ghommie
|
87a6bd013c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-17 21:57:21 +02:00 |
|
|
Ghommie
|
3dab97b62f
|
I set amount instead of max_amount to INFINITY, that's why it hanged.
|
2020-04-17 21:52:08 +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 |
|
|
Artur
|
eafc69aa65
|
Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
|
2020-04-17 16:22:15 +03: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
|
61f833b953
|
Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
|
2020-04-17 05:16:04 -07:00 |
|
|
DeltaFire
|
dcd112c379
|
Hm yes maybe no ratting out would be nice
What it says on the tin.
|
2020-04-17 13:34:34 +02:00 |
|
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02: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 |
|
|
Putnam
|
87dd2681ca
|
The locate isn't necessary
|
2020-04-16 08:30:55 -07:00 |
|
|
Putnam
|
368d801940
|
Makes objectives clean theirselves up properly.
|
2020-04-16 08:17:48 -07: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 |
|
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
|
necromanceranne
|
d0d766efb5
|
Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts
|
2020-04-15 19:00:01 +10: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
|
fb7dc7a54c
|
Fucking icons
|
2020-04-14 09:42:11 +03:00 |
|
|
Artur
|
356f2913d7
|
Ghommies suggestions and renames a proc
|
2020-04-14 09:30:14 +03: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
|
e962afedfa
|
Merge pull request #11825 from Ghommie/Ghommie-cit674
Little Holodeck refactor.
|
2020-04-12 17:03:11 -07:00 |
|