d59196f430
oops
2019-09-11 16:38:55 +01:00
f50e84a20c
Merge branch 'master' into NeuroFix
2019-09-11 16:24:00 +01:00
daba09582a
move to misc.dm
2019-09-11 10:18:10 -05:00
29a6f12a4e
Alligns removal rate to be 2x instead of flat.
2019-09-11 15:00:58 +01:00
17f6304acf
hm
2019-09-11 06:54:50 -04:00
4408d1b684
Gauze fully stops bleed rate on application
2019-09-11 05:54:17 -05:00
f4bff19592
Merge pull request #9260 from dapnee/trim-decals
...
Ports trim decals
2019-09-11 03:26:47 -07:00
4fa09059d7
Medibeam heals bleed_rate and radiation
2019-09-11 04:38:09 -05:00
a0decbfd91
Human magic revival does bleeding heal
2019-09-11 04:37:46 -05:00
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
f2b343518b
Update captain.dm
2019-09-11 02:43:55 -05:00
8988d1e506
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-11 02:41:36 -05:00
88b48ca387
hard caps bleeding rate to 20
2019-09-11 02:37:48 -05:00
c13d8678b8
Update bartender.dm
2019-09-11 02:33:50 -05:00
3e72e13174
double checked
2019-09-11 02:33:32 -05:00
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
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
d61afe0021
Update uplink_kits.dm
2019-09-10 20:29:31 -04:00
a751a73113
Apply suggestions from code review
...
thx Ceb
Co-Authored-By: cebutris <cebutris2000@gmail.com >
2019-09-10 18:52:49 -04:00
c696874d03
Cleanup and compile test.
2019-09-10 22:08:49 +01:00
6da9f1c64c
Indent
2019-09-10 21:51:35 +01:00
68a2b21a7e
removed antagum.
2019-09-10 21:14:34 +01:00
ce5095321c
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-10 20:52:31 +01:00
443f9e433d
Final tweaks
2019-09-10 20:18:45 +01:00
f03c9c236d
Compile fixes and tweaks.
2019-09-10 18:54:47 +01:00
829a2615c5
Merge pull request #9247 from Thalpy/QuantFix
...
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
6bdc0ef0c0
gives engivend upgraded RCDs by default.
2019-09-09 21:12:28 -05:00
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
6cc92da914
bruh
2019-09-09 18:02:23 -05:00
c824f4a6fe
Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross
2019-09-09 20:38:51 +12:00
02771c9d27
Why didnt my last commit save at all?
2019-09-08 22:10:31 -04:00
275457001d
It didnt save my last change
2019-09-08 21:52:28 -04:00
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
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
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
7843e070ff
Update mob.dm
2019-09-08 12:13:24 -07:00
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
1e454ff1a7
Merge branch 'pr/25' into Blind-quirk-without-anger
2019-09-08 03:29:22 +01:00
018ebc32ae
All that remains is MK testing.
2019-09-08 02:46:43 +01:00
3e9d37e70d
Update plushes.dm
2019-09-07 17:13:21 -07:00
d21a45cd53
Doubles stamina regen when laying down/standing
...
Does as named
2019-09-07 20:07:19 -04:00
b8374feafd
Update plushes.dm
2019-09-07 17:03:06 -07:00
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
20ea620e9e
literally why even
2019-09-07 16:46:25 -05:00
8f577e910a
Merge pull request #9238 from Trilbyspaceclone/surgery_stuff
...
Adds two more surgerys - Embalming and Body Rejuvenation
2019-09-07 11:37:13 -07:00
09ed526594
Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
...
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
2019-09-07 11:35:09 -07:00
0f6828e76e
Merge pull request #9224 from kappa-sama/apeserum
...
traitor geneticists can now go ape
2019-09-07 11:27:44 -07:00
c5f3f3d7f9
Merge pull request #9250 from MrJWhit/abductor-spawntext
...
Changes Abductor Spawntext
2019-09-07 11:26:38 -07:00
97072c63c8
Adds text to not disturb the habatat to abductor spawntext
...
Adds "Try not to disturb the habitat, it could lead to dead specimens." to the spawntext.
2019-09-07 13:52:08 -04:00
87cf0b971a
Merge pull request #9221 from Sishen1542/chappy
...
adds some new nullrods with some back end null rod refactors
2019-09-06 16:47:46 -07:00
Fermi