Jordan Brown
|
51e4d9f9db
|
All color inputs use current color as default choice
|
2018-01-24 18:14:16 -06:00 |
|
ShizCalev
|
68cfdb617b
|
Fixes rev mindswap (#34567)
|
2018-01-21 12:29:12 -06:00 |
|
kevinz000
|
54b356a227
|
Fixes stimulum running out before the next breath (#34296)
|
2018-01-12 13:05:12 -06:00 |
|
Leo
|
0985450524
|
Merge pull request #34270 from tgstation/Cyberboss-patch-3
Fixes toolarm grammar
|
2018-01-11 17:12:47 -06:00 |
|
Leo
|
5cc7492f0a
|
Merge pull request #34187 from ShizCalev/butcher-droplocation
Switches butchering/gib drops to use drop_location
|
2018-01-10 03:12:39 -06:00 |
|
deathride58
|
aabbbb9dff
|
aaaand the rest of the modules folder
|
2018-01-04 01:45:38 -05:00 |
|
LetterJay
|
c7db4e8310
|
also syncs a bunch of shit
|
2017-12-29 04:12:43 -06:00 |
|
LetterJay
|
8a792d6ef6
|
more save points
|
2017-12-29 00:07:36 -06:00 |
|
Jordan Brown
|
164db7ae9b
|
Prefixed all disability defines with DISABILITY_ to fix a name collision
|
2017-12-24 15:03:30 -06:00 |
|
Jordan Brown
|
82114e753d
|
Merge pull request #33704 from Fox-McCloud/arm-implant-fix
Fixes Arm Implant EMP Effect
|
2017-12-21 00:43:22 -06:00 |
|
deathride58
|
b2187123fb
|
Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405
[MIRROR] [Ready]Brain Trauma additions
|
2017-12-21 03:42:38 +00:00 |
|
LetterJay
|
408182758f
|
Merge branch 'master' into upstream-merge-33498
|
2017-12-19 17:50:11 -06:00 |
|
LetterJay
|
3895eb9eac
|
Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519
[MIRROR] Finishes the forceMove port
|
2017-12-17 20:28:07 -06:00 |
|
XDTM
|
962f135957
|
[Ready]Brain Trauma additions
|
2017-12-17 11:11:10 -06:00 |
|
Emmett Gaines
|
f875d4e176
|
Defines math, take 2
|
2017-12-17 10:02:43 -06:00 |
|
LetterJay
|
7af461539f
|
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
|
2017-12-16 13:08:50 -06:00 |
|
kevinz000
|
253c819bc1
|
TG Sync 12/15/17
s
s
|
2017-12-15 06:27:57 -08:00 |
|
oranges
|
382017cbe8
|
Merge pull request #33298 from QualityVan/zombrain
Fixes zombie head removal
|
2017-12-14 15:54:07 -06:00 |
|
vuonojenmustaturska
|
fcceb5ec77
|
Finishes the forceMove port
|
2017-12-14 15:40:08 -06:00 |
|
vuonojenmustaturska
|
7f90427a40
|
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
|
2017-12-13 13:56:57 -06:00 |
|
CitadelStationBot
|
cc0b768c72
|
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
|
2017-12-11 16:36:38 -08:00 |
|
deathride58
|
7179547be4
|
Merge branch 'master' into upstream-merge-31727
|
2017-12-10 21:51:51 +00:00 |
|
Jordan Brown
|
7a90baa1f8
|
Merge pull request #33390 from duncathan/atmos-defines
cleans up atmos defines
|
2017-12-09 15:53:34 -06:00 |
|
XDTM
|
988dbe87da
|
Brain Traumas
|
2017-12-06 12:05:20 -06:00 |
|
LetterJay
|
eba36e48f9
|
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
[MIRROR] JSON feedback
|
2017-11-22 18:42:34 -06:00 |
|
deathride58
|
0f9a85e4d7
|
Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
[MIRROR] Refactor of catpeople mutant organs
|
2017-11-21 21:16:31 +00:00 |
|
deathride58
|
1f6b3ce629
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-21 19:53:58 +00:00 |
|
deathride58
|
c2b27ebfa4
|
merges #3837
|
2017-11-21 14:45:44 -05:00 |
|
Leo
|
f668f36156
|
Merge pull request #32928 from ShizCalev/space-leg-slowdown
Fixes humans missing legs moving slower in zero-g enviroments
|
2017-11-21 04:01:56 -06:00 |
|
deathride58
|
eeba86e27e
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-18 05:31:42 +00:00 |
|
deathride58
|
9e78bcd8f9
|
Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
|
2017-11-18 05:29:32 +00:00 |
|
Jordie
|
b7e99a7448
|
JSON feedback
|
2017-11-17 01:44:12 -06:00 |
|
vuonojenmustaturska
|
6ce69fb2c8
|
Replaces a bunch of mob loops with hopefully better ones
|
2017-11-16 16:09:15 -06:00 |
|
oranges
|
952fa2a0f2
|
Fix conflicts between helmet/mech HUDs and HUD glasses
|
2017-11-16 15:39:15 -06:00 |
|
deathride58
|
44a7e6cfea
|
Update ears.dm
|
2017-11-16 12:47:04 -05:00 |
|
LetterJay
|
809951c56c
|
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
[MIRROR] loc -- > forcemove
|
2017-11-14 15:58:20 -06:00 |
|
swindly
|
3fa561c3b1
|
fixes spelling and stuff (#32531)
|
2017-11-09 11:04:50 -06:00 |
|
LetterJay
|
d6e5942baf
|
Merge branch 'master' into upstream-merge-31176
|
2017-11-09 03:24:38 -06:00 |
|
LetterJay
|
51356e89d4
|
Update helpers.dm
|
2017-11-07 04:40:42 -06:00 |
|
oranges
|
9db792b09c
|
Fixes canceling cavity implants
|
2017-11-05 02:09:53 -06:00 |
|
swindly
|
4f04256e46
|
Allows cyborgs to perform limb augmentation (#32233)
* allows organ storage bags to be used to augment limbs
* replaces hardcoded stuff with intiial()
|
2017-11-03 15:55:12 -05:00 |
|
ACCount
|
eb54055278
|
Refactor of catpeople mutant organs
|
2017-11-01 21:38:06 -05:00 |
|
nicbn
|
8aef4f3b57
|
Rename brown gas to nitryl (#32271)
|
2017-11-01 21:37:20 -05:00 |
|
oranges
|
aa88e61169
|
Merge pull request #32109 from ACCount12/runtime_a_day
Fixes a common runtime on prefs screen
|
2017-10-31 15:21:20 -05:00 |
|
LetterJay
|
53314289c8
|
Merge branch 'master' into upstream-merge-31855
|
2017-10-30 23:31:13 -04:00 |
|
LetterJay
|
0e553b26db
|
Merge branch 'master' into upstream-merge-31737
|
2017-10-28 02:20:25 -04:00 |
|
LetterJay
|
79d6f42dfd
|
conflicts
|
2017-10-28 01:16:26 -05:00 |
|
LetterJay
|
141de52658
|
Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
[MIRROR] Assmos part 1, #2
|
2017-10-27 02:47:56 -04:00 |
|
LetterJay
|
4fee09e236
|
Merge pull request #3613 from Citadel-Station-13/upstream-merge-32098
[MIRROR] Fixes a runtime on organ replacement
|
2017-10-27 02:16:47 -04:00 |
|
as334
|
eb4f6326d7
|
Assmos part 1, #2
|
2017-10-26 23:12:27 -05:00 |
|