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 |
|
Putnam
|
c8ce60c856
|
Added back some vore default modes.
|
2020-04-17 18:46:09 -07: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 |
|
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 |
|
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 |
|
Putnam
|
761b3907e3
|
Makes vore noises, enlargement opt-in
|
2020-04-17 09:10:08 -07: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 |
|
jjpark-kb
|
4a38b2870a
|
fix youtool
|
2020-04-17 01:02:52 -04:00 |
|
Trilbyspaceclone
|
6f4a3fc179
|
wine to jello
|
2020-04-16 17:51:03 -04:00 |
|
Ghom
|
e511deabcf
|
Merge pull request #11844 from Arturlang/crafting_fixes
Its no longer possible to craft multiple things at a time
|
2020-04-16 19:08:09 +02:00 |
|
Ghom
|
10bc1229f9
|
Merge pull request #11734 from Trilbyspaceclone/patch-329
Six new Sci based bounties!
|
2020-04-16 19:06:48 +02:00 |
|
Ghom
|
19f79f8843
|
Merge pull request #11611 from monster860/patch-2
Makes so turning in place updates riders when riding someone's back
|
2020-04-16 19:06:10 +02:00 |
|
Ghom
|
bceca18626
|
Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1
you can no longer knock out xenomorphs by punching them in the face i guess
|
2020-04-16 19:04:16 +02: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 |
|
Ghom
|
747672eb50
|
Update update_icons.dm
|
2020-04-16 16:44:07 +02:00 |
|
Ghommie
|
42b67d9240
|
PR is ready.
|
2020-04-16 16:33:04 +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 |
|
Ghom
|
ad6a2b4671
|
Merge pull request #11851 from Citadel-Station-13/kevinz000-patch-4
Contractor kits are now poplocked to 30.
|
2020-04-16 14:46:20 +02:00 |
|
Ghom
|
7cacdb9db7
|
Merge pull request #11879 from Seris02/magboooooooooooots
fixes magboots
|
2020-04-16 14:21:58 +02:00 |
|
Seris02
|
c0ff018bef
|
fixes magboots
|
2020-04-16 16:23:55 +08:00 |
|
Ghom
|
750acd7023
|
Update lighting.dm
|
2020-04-16 05:42:08 +02:00 |
|
Ghommie
|
7193efa613
|
Fixing some doggie issues.
|
2020-04-16 05:29:17 +02:00 |
|
kevinz000
|
e533103ed2
|
Merge branch 'master' into shield_bashing
|
2020-04-15 19:34:08 -07:00 |
|
kappa-sama
|
a41b5d7fac
|
better description
|
2020-04-15 15:41:30 -04:00 |
|
kappa-sama
|
fc24574b52
|
minor nerfies
|
2020-04-15 15:37:57 -04:00 |
|
Trilbyspaceclone
|
93029c9596
|
le sigh
|
2020-04-15 14:48:22 -04:00 |
|
Trilbyspaceclone
|
742654b1d2
|
Update alcohol_reagents.dm
|
2020-04-15 10:44:51 -04:00 |
|
necromanceranne
|
61df831216
|
also makes martial artists spend stamina on disarm aaah
|
2020-04-15 20:07:01 +10:00 |
|
necromanceranne
|
4d1abaad3a
|
fecc
|
2020-04-15 19:59:55 +10:00 |
|
necromanceranne
|
80ce9b70af
|
hecc
|
2020-04-15 19:48:18 +10: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 |
|
UristMcAstronaut
|
ec452de0b2
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-15 08:41:17 +00:00 |
|
Trilbyspaceclone
|
68272ac91a
|
Update flowers.dm
|
2020-04-14 23:14:10 -04:00 |
|
Putnam
|
3b79d6085b
|
WHOOPS GOTTA UPDATE SAVEFILE VERSION
|
2020-04-14 20:10:32 -07:00 |
|
Trilbyspaceclone
|
3def6b861f
|
Update drink_events.dm
|
2020-04-14 20:04:18 -04:00 |
|
Trilbyspaceclone
|
8410d6f35f
|
Why are you like this coffee
|
2020-04-14 19:40:52 -04:00 |
|
Trilbyspaceclone
|
c4f951b80b
|
Tho it IS ment to be 6 not 10
|
2020-04-14 19:35:23 -04:00 |
|