oranges
382017cbe8
Merge pull request #33298 from QualityVan/zombrain
...
Fixes zombie head removal
2017-12-14 15:54:07 -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
ACCount
1c1f39d1d3
Fixes a runtime on organ replacement
2017-10-25 23:38:31 -05:00
Leo
1f83d3cbb7
Merge pull request #32071 from ShizCalev/heart-spam-fix
...
Fixes heartbeat message spam
2017-10-25 18:55:24 -05:00
deathride58
d6735ad5b5
Fuck
2017-10-25 14:40:40 -04:00
deathride58
70a2c466f3
manual mirror of upstream robotic surgery pr
2017-10-25 14:29:45 -04:00
KorPhaeron
be8c5ac631
Dullahans ( #31855 )
...
* Dullahans
* Vision toggle
* The worst part of the code right here
* No wings
* to_chat
* Hearing relay that works, vision toggle that works
* Fixes hair not appearing on severed heads
* Halloween event
* Moves dullahans to their own file
* Forgot to commit a file
* Fixes deafness and backpack issues
* Don't need to breath because you dont have a head
* Breaking the dullahan rules
* Encourage dullahans to lose their heads
* Cyberboss doing his job to head off any bad code trying to enter the repo
* Committing while compiling again
* Can't eat
* Halloween!
* qdeleted
* Get rid of the head var entirely, just track the easily deletable relay
* Moves the stuff out of process to destroy
2017-10-24 14:35:35 -05:00
Jordan Brown
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -05:00
Poojawa
e86688be57
Update implant_removal.dm
2017-10-21 07:28:47 -05:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
e827f02863
[MIRROR] Fixes various spelling and grammar errors. ( #3436 )
...
* Fixes various spelling and grammar errors.
* Update crashedship.dm
* Update listeningstation.dm
* Update augments_chest.dm
* Update augments_chest.dm
2017-10-21 07:10:23 -05:00
Poojawa
10c2b8e672
I guess
2017-10-21 07:09:00 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
Mercenaryblue
a83dbc4455
Decapitation creampie fix [Fix] ( #19701 ) ( #31749 )
...
* creampie fixes
prevent stacking creampie overlays.
makes cleaning it easier.
also fixing the creamy decapitation bug. ( #19701 )
* optimize
* Revert "creampie fixes"
This reverts commit cb1d5bf254339442c977c0400317b20d3d130970.
* Split Issues
making sure we have one PR per issue.
* head removal fix
2017-10-16 16:48:36 -05:00
LetterJay
1bf50d3b89
Update eye_surgery.dm
2017-10-16 06:12:54 -05:00
Jordan Brown
f205911b5a
Adds defines for organ slots
2017-10-15 19:34:42 -05:00
kevinz000
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
LetterJay
effc7ccedf
Update lipoplasty.dm
2017-10-12 06:24:35 -05:00
LetterJay
51b7bdfb00
Update implant_removal.dm
2017-10-12 06:24:19 -05:00
