dae93856f5
Traitorbro fixes
2017-09-20 03:48:33 -05:00
accd92a676
[MIRROR] Fixes mode conversion runtime ( #2855 )
...
* Fixes mode conversion runtime (#30857 )
* Fixes mode conversion runtime
2017-09-20 01:40:52 -05:00
6d717995a4
Update meteors.dm ( #2867 )
2017-09-20 01:40:09 -05:00
19309d76d0
Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344
...
[MIRROR] Traitorbro gamemode
2017-09-18 08:35:00 -04:00
4bc6e9d522
[MIRROR] Cleaned up some decimal values. ( #2797 )
...
* Cleaned up some decimal values.
* Update gas_mixture.dm
* Update color.dm
* Update medsci.dm
2017-09-18 01:45:39 -05:00
b1ba49f37e
[MIRROR] Blobbernauts are healed quicker by cores and nodes ( #2821 )
...
* Blobbernauts are healed quicker by cores and nodes (#30527 )
* Blobbernauts are healed quicker by cores and nodes
i hate sitting for 3-5 minutes waiting to heal as a naut
* no you can't heal without a factory
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Blobbernauts are healed quicker by cores and nodes
2017-09-17 22:23:08 -05:00
a01f3213f5
Traitorbro gamemode
2017-09-17 18:03:12 -05:00
dd4f68dfee
Cleans up .rej spam and the empty file from #2792 ( #2818 )
...
* Cleans up .rej spam and the empty file from #2792
* Update tgstation.dme
2017-09-17 11:56:55 -05:00
a91f7efe5e
[MIRROR] Fixes the doomsday device announcements ( #2789 )
...
* Fixes the doomsday device announcements
* Fixes the doomsday device announcements
2017-09-16 04:31:46 -05:00
4dffe75a30
[MIRROR] Syndicate Borgs now show up as Syndicate Borgs in Check Antags ( #2781 )
...
* Merge pull request #30713 from ExcessiveUseOfCobblestone/patch-3
Syndicate Borgs now show up as Syndicate Borgs in Check Antags
* Syndicate Borgs now show up as Syndicate Borgs in Check Antags
2017-09-15 03:33:50 -05:00
f07369aead
[MIRROR] Fixes nuking the syndicate base ( #2767 )
...
* Merge pull request #30694 from KorPhaeron/syndie_nuke
Fixes nuking the syndicate base
* Fixes nuking the syndicate base
2017-09-14 13:24:43 -05:00
e4db027692
[MIRROR] Fixes to more Initialize procs ( #2733 )
...
* Fixes to more Initialize procs
* Update ai_monitored.dm
* Update cleanable.dm
* Update instruments.dm
* Update musician.dm
* Update noticeboard.dm
* Update mimic.dm
* Update interactive.dm
2017-09-13 22:54:12 -05:00
9a4f84da5e
[MIRROR] Refactors roundstart centcom threat report. ( #2739 )
...
* Refactors roundstart centcom threat report.
* Update blob.dm
* Update changeling.dm
* Update traitor_chan.dm
* Update sandbox.dm
* Update traitor.dm
2017-09-13 22:50:01 -05:00
083fc1a7b4
[MIRROR] Standardized power displays ( #2539 )
...
* Standardized power displays
* Update tgui.js
* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00
470d15fa2b
Update borer_event.dm
2017-09-13 07:13:45 -05:00
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
0429a75e52
Merge pull request #2710 from Citadel-Station-13/upstream-merge-30592
...
[MIRROR] Fixed changeling augmented eyesight ability
2017-09-12 19:10:52 -05:00
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
bf5094cf19
Update nuclearbomb.dm
2017-09-11 18:40:30 -05:00
d9abc21a9a
Fixed changeling augmented eyesight ability ( #30592 )
...
* Fix changeling augmented eyesight
Fix not being able to toggle changeling augmented eyesight off again.
* Fix augmented eyesight
Fix changeling's augmented eyesight ability.
* Fix changeling augmented vision
Fix changeling augmented vision, for real this time. Makes it properly grant night vision on purchase, remove granted effects on refund, and properly toggle on and off. Note, this changes it to x-ray vision, to replicate the way it has been working for well over a year.
2017-09-11 18:38:16 -05:00
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
6cc0ea6af0
Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412
...
[MIRROR] Regularizes resisting out of containers
2017-09-11 18:05:52 -05:00
240c5bdaad
Update game_mode.dm
2017-09-11 15:55:27 -05:00
59772e2afd
Update events.dm
2017-09-11 15:54:55 -05:00
16912124e5
Update ritual.dm
2017-09-11 15:54:38 -05:00
e767e20574
Update game_mode.dm
2017-09-11 15:49:54 -05:00
9bb9aaa17d
Update events.dm
2017-09-11 15:48:59 -05:00
6b671ffd06
Update ritual.dm
2017-09-11 15:48:24 -05:00
c46c442896
Merge pull request #2635 from Citadel-Station-13/upstream-merge-30454
...
[MIRROR] Gets rid of manual overlay manipulation
2017-09-11 15:21:43 -05:00
b008cdada0
oopsie woopsie
2017-09-11 13:47:33 -05:00
489b2c6deb
Update objective_items.dm
2017-09-11 13:08:35 -05:00
26c6f5cc14
Update pinpointer.dm
2017-09-11 13:07:35 -05:00
052fdb70ea
Update nuclearbomb.dm
2017-09-11 13:06:27 -05:00
6a47a7011a
Update nuclear.dm
2017-09-11 13:05:22 -05:00
48e71cfbd5
Update Malf_Modules.dm
2017-09-11 13:04:28 -05:00
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
c3fed32afb
Update prolonging_prism.dm
2017-09-10 15:17:25 -05:00
685c534d88
Merge pull request #2681 from Citadel-Station-13/upstream-merge-30524
...
[MIRROR] Removes a src.
2017-09-10 09:47:01 -05:00
b363dc352f
[MIRROR] remove GLOB. ( #2683 )
...
* Merge pull request #30540 from p440/blobglob
remove GLOB.
* remove GLOB.
2017-09-10 09:07:18 -05:00
ee4052eb61
Merge pull request #30524 from ChangelingRain/srcremoval
...
Removes a src.
2017-09-10 06:02:06 -05:00
5b61c84df4
Merge pull request #30481 from YPOQ/shuntfix
...
Placing a robotics factory actually disables shunting
2017-09-08 21:25:28 -05:00
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
8d854a53d8
Merge pull request #2637 from Citadel-Station-13/upstream-merge-30426
...
[MIRROR] Fixes swarmers breaking the SM's containment
2017-09-07 10:21:57 -05:00
31102d0ec4
Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
...
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
7fb4426011
Fixes swarmers breaking the SM's containment ( #30426 )
...
* Fixes swamers breaking the SM
* Switched checks to use get_area
2017-09-07 05:17:51 -05:00
pubby