 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 |
|
|
Anonymous
|
4f6e849af4
|
Fixes pre-tmp trek suit on-mob icons
Really speaks about nobody using trek loadout, huh?
|
2020-04-17 14:04:47 +03:00 |
|
|
Anonymous
|
d61c0dc155
|
KHAAAAAAAAAAN!!
Adds TMP enlist, trainee and service uniforms.
Also fixes inaccurate restricted description for existing trek loadout.
|
2020-04-17 10:53:43 +03:00 |
|
|
Ghom
|
0fb1286042
|
Update guardian.dm
|
2020-04-17 08:47:05 +02:00 |
|
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
|
kappa-sama
|
21f7a6032d
|
this
|
2020-04-17 00:50:42 -04:00 |
|
|
timothyteakettle
|
a4cc54781f
|
implements isfood helper
|
2020-04-17 01:45:15 +01:00 |
|
|
Timothy Teakettle
|
aa6d6883e3
|
remove a random 'r'
|
2020-04-17 01:34:46 +01:00 |
|
|
Timothy Teakettle
|
f821d33f44
|
change clamp to CLAMP
requested change, and i don't plan on subtypes with different effects based on food quality
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-04-17 01:32:42 +01:00 |
|
|
Trilbyspaceclone
|
6f4a3fc179
|
wine to jello
|
2020-04-16 17:51:03 -04: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
|
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 |
|
|
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 |
|
|
Ghom
|
b7b9fc55f5
|
Update preferences_savefile.dm
|
2020-04-16 15:54:59 +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 |
|
|
Artur
|
75dab9fa57
|
And some other fixes
|
2020-04-16 10:51:17 +03: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 |
|
|
Ghommie
|
e588b504c1
|
work.
|
2020-04-16 04:09:20 +02:00 |
|
|
Ghommie
|
3533ceb4ed
|
I'm tired.
|
2020-04-16 03:55:53 +02:00 |
|
|
Ghommie
|
586966ea51
|
General refactor for some snowflake bodyparts procs and taurs.
|
2020-04-16 03:37:52 +02: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 |
|
|
Artur
|
ddcfcb5cd8
|
Conflicts sure are !!FUN!!
Also adds dolphin gloves to the glove crate, and fixes fortitude
|
2020-04-15 12:33:59 +03:00 |
|
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
|
Artur
|
aecbce222a
|
Comment because why the heck not
|
2020-04-15 12:12:06 +03:00 |
|
|
Artur
|
375c62175f
|
Finishing touches, fixes icons
|
2020-04-15 12:04:25 +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 |
|
|
UristMcAstronaut
|
ec452de0b2
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-15 08:41:17 +00:00 |
|
|
kevinz000
|
20c3c648ce
|
Update living.dm
|
2020-04-14 21:50:39 -07: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
|
8fed6552cd
|
last fixes
|
2020-04-14 22:44:47 -04:00 |
|