 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 |
|
|
TrilbySpaceClone
|
4419dc13f5
|
changes and additons
|
2020-04-14 22:17:53 -04:00 |
|
|
Trilbyspaceclone
|
8410d6f35f
|
Why are you like this coffee
|
2020-04-14 19:40:52 -04:00 |
|
|
TrilbySpaceClone
|
d49210fd48
|
Merge branch 'master' into race_drinks
|
2020-04-14 19:21:47 -04:00 |
|
|
TrilbySpaceClone
|
a46a6227a9
|
Finally done...
|
2020-04-14 19:11:53 -04:00 |
|
|
Linzolle
|
d43cb78b8b
|
one more
|
2020-04-14 18:02:51 -05:00 |
|
|
Linzolle
|
166370fb6c
|
missed one
|
2020-04-14 17:55:22 -05:00 |
|
|
Linzolle
|
39e6541ccd
|
remove bad words
|
2020-04-14 17:54:07 -05:00 |
|
|
Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05:00 |
|
|
Ghommie
|
d84ef22f22
|
I'm amazed this actually works fine.
|
2020-04-14 21:58:37 +02:00 |
|
|
Lin
|
79f41bc654
|
Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4
Hardsuit helmet peeve.
|
2020-04-14 18:37:31 +00:00 |
|
|
Ghommie
|
571584901c
|
Custom skin tone preferences.
|
2020-04-14 19:10:28 +02:00 |
|
|
UristMcAstronaut
|
ec734475cc
|
Add files via upload
|
2020-04-14 16:21:30 +00:00 |
|
|
TrilbySpaceClone
|
79a72a50d4
|
this is annoying, why is angel not defind as a race
|
2020-04-14 11:13:49 -04:00 |
|
|
Ghom
|
55402b1834
|
Merge branch 'master' into Ghommie-cit679
|
2020-04-14 16:22:00 +02: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
|
3ec71612e7
|
Update uplink_bundles.dm
|
2020-04-14 01:49:14 -07:00 |
|
|
kevinz000
|
b10c479d16
|
Merge pull request #11655 from Citadel-Station-13/Ghommie-patch-3
Gives a cooldown to the crusher's vortex talisman trophy.
|
2020-04-14 01:37:36 -07:00 |
|
|
kevinz000
|
7861b044ea
|
Merge pull request #11826 from Ghommie/Ghommie-cit675
Body size preferences! Oh no!
|
2020-04-14 01:35:46 -07:00 |
|
|
kevinz000
|
1f900f0e9d
|
Merge pull request #11829 from Citadel-Station-13/Ghommie-patch-5
Fixing a whacky miniature cell duping issue.
|
2020-04-14 01:34:45 -07:00 |
|
|
kevinz000
|
e271376c4e
|
Merge pull request #11830 from Ghommie/Ghommie-cit676
Fixes the phantom thief component, again
|
2020-04-14 01:34:18 -07:00 |
|
|
kevinz000
|
2961bf8698
|
Merge pull request #11838 from kappa-sama/gamingtime
makes circuit theft admin only
|
2020-04-14 01:33:06 -07:00 |
|