24cc205ce5
On primary antagonist rounds (wizard/blob/malfunction) if the config is set for continous rounds the round will convert on the fly to a new mode choosen from these mode if the primary antagonist dies:
...
EXTENDED
TRAITOR
CHANGELING
DOUBLE AGENTS
TRAITORLING
based on the game probabilities set through the config.
The round will not convert if more than 30% of the players are dead (round immediatly ends) or if the shuttle is beyond the point of no return (the round ends normally).
Adds the CONTINIOUS_ROUND_BLOB config
2015-02-22 21:32:17 -05:00
8f707e134e
Merge branch 'master' of https://github.com/tgstation/-tg-station into starrlight
...
Conflicts:
code/controllers/configuration.dm
2015-02-22 04:12:54 -08:00
1035d95f90
Merge pull request #7716 from paprka/megaphoney
...
Adds megaphones
2015-02-22 12:58:49 +01:00
c792f211a3
Merge pull request #7555 from paprka/asscap
...
Assistant cap config
2015-02-22 12:58:27 +01:00
d8e3f7f28a
fixes usr.stat
2015-02-22 03:37:02 -08:00
8e4982276a
Merge pull request #7825 from RandomMarine/cargokits
...
Adds brute first aid kits to cargo.
2015-02-22 12:06:22 +01:00
3cd66f4f34
Merge pull request #7739 from paprka/computerlights
...
Computers emitting light
2015-02-22 12:05:34 +01:00
69d4ec3e5f
Merge pull request #7615 from Xhuis/burnfilthypigs
...
Adds malicious modes to air and fire alarms
2015-02-22 12:03:53 +01:00
555840fc1b
Merge pull request #7498 from Incoming5643/Fell_Pull_Commit_of_Orc_Slaying_+2
...
Magic Mania 1.85: RPG loot event
2015-02-22 11:59:09 +01:00
96e7a5c473
Merge pull request #7864 from Jordie0608/yoursisthelistthatwillcrashtheserver
...
Warning check before sorting long lists in vv
2015-02-22 11:57:01 +01:00
3675f2e997
Merge pull request #7899 from Jordie0608/eyesarewindowstothesoulbeardsarewindowstothechin
...
Fixes #7898
2015-02-22 11:55:13 +01:00
edcfae62d3
spellfix
2015-02-22 21:32:39 +11:00
44e3c104e3
Merge pull request #7857 from Delimusca/heatermaths
...
fixes heater rounding, lowered heater coefficient
2015-02-21 23:37:33 -08:00
079f47c47c
Merge pull request #7768 from GunHog/AdminLoggingForExperimentor
...
Admin logging for Experimentor and Relics
2015-02-21 19:19:48 +01:00
68942e1ace
Merge pull request #7686 from xxalpha/newgraffiti
...
New graffiti.
2015-02-21 12:46:45 +01:00
5a3d9d883f
Warning check before sorting long lists in vv
2015-02-21 21:46:42 +11:00
0f8fc471d3
fixes heater rounding, coeff. lowered to .10
2015-02-21 01:03:30 -07:00
51b4bbf71e
Revert "Allows portable machines to be mounted on any turf that can have cables."
2015-02-21 02:29:29 +03:00
cd00e07f4f
Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor
...
Conflicts:
code/modules/research/experimentor.dm
2015-02-20 15:23:07 -06:00
1cd892a0fd
Experimentor Invesigate Take 1
...
- Logs lots of the things to experimentor investigate.
2015-02-20 15:09:59 -06:00
fe3764dae8
Merge pull request #7765 from Thunder12345/glovening
...
[REFACTOR] Reworks maintenance fake insulated gloves
2015-02-20 14:24:54 -06:00
ac00052da6
Merge pull request #7780 from xxalpha/catwalkmachines
...
Allows portable machines to be mounted on any turf that can have cables.
2015-02-20 13:32:44 -06:00
6d78f9b77d
Merge pull request #7828 from Incoming5643/let_us_never_speak_of_this_again
...
Removes the unintended ability to have sex with cats
2015-02-20 13:18:46 -06:00
b4a1594810
Merge pull request #7797 from Mandurrrh/Barsigntaketwo
...
Adds interchangeable bar signs and a variety of choices.
2015-02-20 19:34:49 +01:00
e861281a03
Merge pull request #7783 from Delimusca/minesofshame
...
cleans up mines
2015-02-20 12:16:14 -06:00
23677f4df1
Merge pull request #7808 from phil235/CookingTweaks
...
Cooking Tweaks
2015-02-20 12:02:04 -06:00
df57ea312b
add singulo description
2015-02-20 12:56:11 -05:00
048759adca
Merge pull request #7818 from Mandurrrh/dancingqueen
...
Color options added to light up floor tiles.
2015-02-20 18:51:56 +01:00
b67569869b
Merge pull request #7843 from Mandurrrh/fixforbooze
...
Fixes issue #7841
2015-02-20 18:51:29 +01:00
1301fdd9ab
Fixes maps, adds emp barsign, fixes merge conflicts.
2015-02-20 12:08:04 -05:00
7af2e457c8
Merge pull request #7705 from GunHog/NVG_Mesons
...
Adds NVG Mesons
2015-02-20 17:44:38 +01:00
3e43beab29
Fixes issue #7841
2015-02-20 09:15:20 -05:00
7fbf0a261b
mergeconflictfix
2015-02-20 09:06:04 -05:00
59d3e8be1e
actually fixes luminosity this time guys!
2015-02-20 03:37:16 -08:00
3b3a008e09
further fixes luminosity
2015-02-20 03:35:33 -08:00
7f0373640a
fixes lighting checks
2015-02-20 03:26:56 -08:00
e4fa3369f2
Merge pull request #7743 from GunHog/YetAnotherExperimentorFix
...
Fixes E.X.P.E.R.I-MENTOR blood sacrifice!
2015-02-20 09:51:55 +03:00
452aa3d961
Merge pull request #7791 from Mandurrrh/Booze
...
Adds fountain machines for bar.
2015-02-20 09:19:42 +03:00
a761fd2306
Merge pull request #7826 from TheVekter/fuckthestation
...
Adds the new Self-Destruct Mechanism to the vault
2015-02-20 08:56:31 +03:00
e6bccac85b
spesslight
2015-02-19 21:05:59 -08:00
55208e408d
Merge pull request #7419 from paprka/beltoveray
...
adds a simple overlay system for belts
2015-02-20 07:06:20 +03:00
383e4e7111
Merge pull request #7792 from Menshin/regen_statis_tweaks
...
Regenerative statis tweaks
2015-02-19 13:07:24 -08:00
ea12d68e60
Merge pull request #7817 from paprka/whatthefucktg
...
Syndicate shotguns spawn with buckshot by default
2015-02-19 13:07:08 -08:00
5365dd1438
Merge pull request #7799 from paprka/magshit
...
removes bloat from magazines icons
2015-02-19 21:01:46 +03:00
66720a5ce9
Merge pull request #7834 from Menshin/telexploit_fix
...
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:39:49 +01:00
0d0ef9e02a
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:34:49 +01:00
83db82e62d
Fixed a typo
2015-02-19 11:52:40 +01:00
dc4c4ea90b
Merge branch 'master' of https://github.com/tgstation/-tg-station into megaphoney
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
2015-02-18 23:15:15 -08:00
0cd74ff882
Merge pull request #7717 from phil235/sechailerAdjustFix
...
Fixes the cyborg sechailer being adjustable.
2015-02-18 21:50:12 -08:00
9b91896897
Merge pull request #7769 from phil235/rapidDupeProcFix
...
Fixes bugs with experimentor relics with rapidDupe proc.
2015-02-18 21:49:48 -08:00
Incoming
paprka
Swag McYolosteinen
Jordie0608
hornygranny
phil235
Delimusca
Razharas
GunHog
Cheridan
Mandurrrh
Menshin
phil235