deathride58
4551b13547
[s] ports tgstation/tgstation#46425
2019-09-11 19:24:05 -04:00
Ghommie
e8a3612619
dark and default tweaks.
2019-09-12 01:01:26 +02:00
Poojawa
6dfb22ea47
Update preferences_savefile.dm
2019-09-11 17:58:32 -05:00
Poojawa
0ac3a2307d
Update wings.dm
2019-09-11 17:48:57 -05:00
Poojawa
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
Fermi
6b76b09449
Missed 2
2019-09-11 23:30:56 +01:00
Ghommie
cbf041663f
Fixing and testing themes.
2019-09-11 23:30:04 +02:00
TrilbySpaceClone
fa868ce4ff
fashen crime
2019-09-11 14:22:50 -04:00
Fermi
c003352d35
Made it 2.5x
2019-09-11 19:08:57 +01:00
Fermi
db8586950f
Made it 3x
2019-09-11 19:07:40 +01:00
Fermi
c79c4aafa5
Cleans up var/test into targetReagent
2019-09-11 18:51:05 +01:00
Fermi
409cbe876a
Okay ACTUALLY does what I want it to.
2019-09-11 18:46:32 +01:00
Linzolle
5ab224e20a
tweak values
2019-09-11 11:34:27 -05:00
Fermi
d59196f430
oops
2019-09-11 16:38:55 +01:00
Thalpy
f50e84a20c
Merge branch 'master' into NeuroFix
2019-09-11 16:24:00 +01:00
Linzolle
daba09582a
move to misc.dm
2019-09-11 10:18:10 -05:00
Fermi
29a6f12a4e
Alligns removal rate to be 2x instead of flat.
2019-09-11 15:00:58 +01:00
TrilbySpaceClone
17f6304acf
hm
2019-09-11 06:54:50 -04:00
Poojawa
4408d1b684
Gauze fully stops bleed rate on application
2019-09-11 05:54:17 -05:00
kevinz000
f4bff19592
Merge pull request #9260 from dapnee/trim-decals
...
Ports trim decals
2019-09-11 03:26:47 -07:00
Poojawa
4fa09059d7
Medibeam heals bleed_rate and radiation
2019-09-11 04:38:09 -05:00
Poojawa
a0decbfd91
Human magic revival does bleeding heal
2019-09-11 04:37:46 -05:00
Poojawa
6353bd1064
Cult heals do bleed stopping
...
blood cap raised because honestly there's so much bleed_rate heal available now too
2019-09-11 04:37:22 -05:00
Poojawa
f2b343518b
Update captain.dm
2019-09-11 02:43:55 -05:00
Poojawa
8988d1e506
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-11 02:41:36 -05:00
Poojawa
88b48ca387
hard caps bleeding rate to 20
2019-09-11 02:37:48 -05:00
Poojawa
c13d8678b8
Update bartender.dm
2019-09-11 02:33:50 -05:00
Poojawa
3e72e13174
double checked
2019-09-11 02:33:32 -05:00
kevinz000
ff0c3ee844
Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
...
The art of drunken captaining
2019-09-10 22:06:36 -07:00
kevinz000
076b6c8699
Merge pull request #9077 from Sishen1542/id-boingo
...
No ID insertion for everything except the hop console
2019-09-10 22:04:48 -07:00
Trilbyspaceclone
d61afe0021
Update uplink_kits.dm
2019-09-10 20:29:31 -04:00
Trilbyspaceclone
a751a73113
Apply suggestions from code review
...
thx Ceb
Co-Authored-By: cebutris <cebutris2000@gmail.com >
2019-09-10 18:52:49 -04:00
Fermi
6da9f1c64c
Indent
2019-09-10 21:51:35 +01:00
kevinz000
829a2615c5
Merge pull request #9247 from Thalpy/QuantFix
...
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
Tupinambis
6bdc0ef0c0
gives engivend upgraded RCDs by default.
2019-09-09 21:12:28 -05:00
BlackMajor
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
Linzolle
6cc92da914
bruh
2019-09-09 18:02:23 -05:00
BlackMajor
c824f4a6fe
Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross
2019-09-09 20:38:51 +12:00
Trilbyspaceclone
02771c9d27
Why didnt my last commit save at all?
2019-09-08 22:10:31 -04:00
Trilbyspaceclone
275457001d
It didnt save my last change
2019-09-08 21:52:28 -04:00
TrilbySpaceClone
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
nik707
11846849cf
Merge pull request #9249 from Trilbyspaceclone/patch-224
...
Clean bot now cleans Cumstains, glitter, tiny glass shards and more!
2019-09-08 19:49:44 -04:00
nik707
bfbf9f2492
Merge pull request #9254 from Citadel-Station-13/gloria-plushie
...
Adds Gloria Redwood plushie as well as heichou's plushies.
2019-09-08 19:47:50 -04:00
kevinz000
7843e070ff
Update mob.dm
2019-09-08 12:13:24 -07:00
Dap
9f275ebf01
Ports trim decals
...
## About The Pull Request
So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.
## Changelog
🆑
add: Trim lines!
/🆑
2019-09-08 10:51:05 -06:00
Fermi
1e454ff1a7
Merge branch 'pr/25' into Blind-quirk-without-anger
2019-09-08 03:29:22 +01:00
kevinz000
3e9d37e70d
Update plushes.dm
2019-09-07 17:13:21 -07:00
chefferz
d21a45cd53
Doubles stamina regen when laying down/standing
...
Does as named
2019-09-07 20:07:19 -04:00
kevinz000
b8374feafd
Update plushes.dm
2019-09-07 17:03:06 -07:00
Linzolle
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
