Commit Graph

9869 Commits

Author SHA1 Message Date
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
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
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
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
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
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
kevinz000
7843e070ff Update mob.dm 2019-09-08 12:13:24 -07:00
Fermi
1e454ff1a7 Merge branch 'pr/25' into Blind-quirk-without-anger 2019-09-08 03:29:22 +01:00
chefferz
d21a45cd53 Doubles stamina regen when laying down/standing
Does as named
2019-09-07 20:07:19 -04:00
Linzolle
64b757f404 refactor suits 2019-09-07 17:10:10 -05:00
kevinz000
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
kevinz000
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
kevinz000
0f6828e76e Merge pull request #9224 from kappa-sama/apeserum
traitor geneticists can now go ape
2019-09-07 11:27:44 -07:00
kevinz000
c5f3f3d7f9 Merge pull request #9250 from MrJWhit/abductor-spawntext
Changes Abductor Spawntext
2019-09-07 11:26:38 -07:00
MrJWhit
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
kevinz000
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
Trilbyspaceclone
8c05b4a1d8 *poor cleanbot* 2019-09-06 19:20:32 -04:00
Trilbyspaceclone
3c38e6eb3d Update cleanbot.dm 2019-09-06 18:49:42 -04:00
kevinz000
4b0505f691 Merge pull request #9239 from Trilbyspaceclone/patch-222
Nerfs earths blood stam regen from 30  - > 13
2019-09-06 11:45:21 -07:00
BlackMajor
3e5a192af0 Updates borg examine to also show what module type they are. 2019-09-06 13:31:01 +12:00
BlackMajor
cca2001ccb Fixes dogborgs not using their deadsprite 2019-09-06 12:29:36 +12:00
Fermi
816ae638a2 [TO_TEST] 2019-09-05 23:19:53 +01:00
Fermi
29e5c1c10a Still some residual chems kicking about..!! 2019-09-05 23:15:30 +01:00
BlackMajor
fbc2d3c8fe Ports dogborg sprites from RP to main
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
2019-09-06 01:23:53 +12:00
Linzolle
5bc6c9ea04 requested change 2019-09-04 21:18:18 -05:00
nik707
d8dee76d28 Merge pull request #9222 from Citadel-Station-13/kevinz000-patch-80
TK dusting now uses the proper removal procs to prevent bugs
2019-09-04 20:14:06 -05:00
nik707
586eb56977 Merge pull request #9230 from Ghommie/Ghommie-cit191
Fixing clockie mass recall that I apparently didn't really fix correctly before.
2019-09-04 19:45:19 -05:00
Linzolle
f4ed7d04f0 help screen 2019-09-04 14:19:14 -05:00
Trilbyspaceclone
dbdaae83b6 Update medicine_reagents.dm 2019-09-04 13:29:58 -04:00
Alonefromhell
eee1ccbe2c merge oracle ui from kepler 2019-09-04 11:42:04 -05:00
TrilbySpaceClone
084b37ae4e tada 2019-09-04 10:13:32 -04:00