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
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
952fa2a0f2
Fix conflicts between helmet/mech HUDs and HUD glasses
2017-11-16 15:39:15 -06:00
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
d6e5942baf
Merge branch 'master' into upstream-merge-31176
2017-11-09 03:24:38 -06:00
51356e89d4
Update helpers.dm
2017-11-07 04:40:42 -06:00
9db792b09c
Fixes canceling cavity implants
2017-11-05 02:09:53 -06:00
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
8aef4f3b57
Rename brown gas to nitryl ( #32271 )
2017-11-01 21:37:20 -05:00
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
53314289c8
Merge branch 'master' into upstream-merge-31855
2017-10-30 23:31:13 -04:00
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
79d6f42dfd
conflicts
2017-10-28 01:16:26 -05:00
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
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
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
1c1f39d1d3
Fixes a runtime on organ replacement
2017-10-25 23:38:31 -05:00
1f83d3cbb7
Merge pull request #32071 from ShizCalev/heart-spam-fix
...
Fixes heartbeat message spam
2017-10-25 18:55:24 -05:00
d6735ad5b5
Fuck
2017-10-25 14:40:40 -04:00
70a2c466f3
manual mirror of upstream robotic surgery pr
2017-10-25 14:29:45 -04:00
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
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -05:00
e86688be57
Update implant_removal.dm
2017-10-21 07:28:47 -05:00
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
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
10c2b8e672
I guess
2017-10-21 07:09:00 -05:00
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
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
1bf50d3b89
Update eye_surgery.dm
2017-10-16 06:12:54 -05:00
f205911b5a
Adds defines for organ slots
2017-10-15 19:34:42 -05:00
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
effc7ccedf
Update lipoplasty.dm
2017-10-12 06:24:35 -05:00
51b7bdfb00
Update implant_removal.dm
2017-10-12 06:24:19 -05:00
033d14e8b3
loc -- > forcemove
2017-10-12 06:13:11 -05:00
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
cee28e27fe
Fixes invalid arg runtime with drop_if_replaced ( #31439 )
...
* Update augments_eyes.dm
* Update eyes.dm
2017-10-09 19:05:18 -05:00
6cb68e06e3
Update autoimplanter.dm
2017-10-08 15:07:28 -05:00
86d9e5955a
Update autoimplanter.dm
2017-10-08 14:51:27 -05:00
2606143343
Update limb_augmentation.dm
2017-10-07 22:52:12 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
c22f4a044d
Merge pull request #31238 from AnturK/specialeyes
...
Space vision fix V2.0 - GAME_PLANE change
2017-10-04 15:14:07 -05:00
fd5acc5573
Organ initialization cleanup
2017-10-03 14:18:39 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
9da41c3596
Stops revheads from being metagamed with healthscanners & medical HUDs. ( #31110 )
...
* Stops revheads metagaming
* Added comment.
2017-09-28 22:00:16 -05:00
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05:00
deathride58