Incoming
44d30afd20
Hotfix for Blob mulligan rounds. WHOOOOOPS
2015-03-03 19:42:01 -05:00
Razharas
64d0af336d
Merge pull request #8099 from Incoming5643/doublemint_heads
...
Fixes duplicated heads
2015-03-03 21:32:46 +03:00
Swag McYolosteinen
5fcf0570b7
Merge pull request #8118 from Mandurrrh/pdabugfix
...
Fixes GhostPDA bug making it show in lobby. Please merge quick.
2015-03-03 11:26:48 +01:00
Swag McYolosteinen
c2290c6c5c
Merge pull request #7913 from phil235/NewPlants
...
Adds new plants to botany
2015-03-03 11:23:32 +01:00
Razharas
665afe10e1
Merge pull request #8104 from Ikarrus/changelognotify
...
Chatlog notification of changelog updates
2015-03-03 10:36:57 +03:00
Razharas
a07f6e6bfa
Merge pull request #8103 from Ikarrus/antag_babbies
...
Age Restrictions for Antagonists
2015-03-03 09:02:52 +03:00
Ikarrus
e85e010bd4
Cleanup: Removed an unnecessary comma
2015-03-02 22:37:27 -07:00
Mandurrrh
c52a630a17
Fixes GhostPDA bug making it show in lobby.
2015-03-02 20:52:46 -05:00
Ikarrus
de362eabc9
Fixing type in index comments
2015-03-02 17:43:45 -07:00
Incoming
ca54747be7
Fixes mulligan'd rounds from never ending because the shuttle was set to strand still
...
WHOOPS
2015-03-02 18:30:57 -05:00
hornygranny
539d51fb57
Merge pull request #8091 from MrStonedOne/whydidthistakesolong
...
Adds admin alert when random events fire
2015-03-02 12:02:43 -08:00
Swag McYolosteinen
4272ada464
Merge pull request #8042 from Mandurrrh/ghostpda
...
Adds the ability to see pda messages in Deadchat
2015-03-02 19:56:28 +01:00
phil235
d2d0888432
Merge pull request #7726 from xxalpha/traymesons
...
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01:00
xxalpha
c063665a84
Remove unnecessary check.
2015-03-02 18:15:51 +00:00
xxalpha
fd958372a3
Fixed a bug.
2015-03-02 17:41:59 +00:00
Mandurrrh
cde9de9e85
merge commits
2015-03-02 12:40:16 -05:00
xxalpha
42dd431e6f
Removed duplicate code.
...
Removed more duplicate code.
2015-03-02 17:24:40 +00:00
Swag McYolosteinen
daffcdf075
Merge pull request #7987 from phil235/SugarSatietyRemoval
...
Remove sugar satiety effect
2015-03-02 18:17:40 +01:00
Mandurrrh
7865f56b1a
Merge remote-tracking branch 'remotes/Upstream/master' into ghostpda
...
Conflicts:
code/__DEFINES/preferences.dm
2015-03-02 11:46:07 -05:00
Ikarrus
5341a48a86
span classes
2015-03-02 09:19:00 -07:00
Mandurrrh
da6d3fc2cd
Creates a separate toggle for ghosts to see pda messages!
2015-03-02 10:57:25 -05:00
Swag McYolosteinen
969b301930
Merge pull request #8028 from Cheridan/foam_hose
...
Fixes metal foam dispenser mode for atmos backpack tank.
2015-03-02 16:47:29 +01:00
MrStonedOne
cd75ad8693
Fixes admin alert for event triggering logic
...
Forgot to have it check the event's config in the second loop
2015-03-02 07:24:45 -08:00
MrStonedOne
a3076ce0eb
Admin event alerts can now be disabled per event.
...
Disabled for electrical overload and space dust.
2015-03-02 07:20:23 -08:00
Cheridan
d218256e32
Merge pull request #7854 from phil235/LifeProcsDuplicateFix
...
Life procs duplicate fix
2015-03-02 09:16:09 -06:00
Cheridan
2be30eb89e
Merge pull request #8083 from Delimusca/getochemboyz
...
added improvised heating
2015-03-02 08:58:12 -06:00
Cheridan
1ef6cf1229
Merge pull request #8061 from Jordie0608/thisisindicativeofalargerrechargerconspiracy
...
Fixes #8052 Cyborg recharger density
2015-03-02 08:37:27 -06:00
Cheridan
00be838acc
Merge pull request #8011 from Jordie0608/CMOSisforscrubskeepyourcomputerclocksavedinRAM
...
Server time for status panel
2015-03-02 08:32:48 -06:00
phil235
d856e240c2
Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
...
Conflicts:
icons/mob/head.dmi
2015-03-02 13:45:15 +01:00
Swag McYolosteinen
7c0e24f692
Merge pull request #7454 from Iamgoofball/patch-24
...
Makes water wash colorful reagent off too
2015-03-02 13:28:26 +01:00
Cheridan
6ca5a89025
Merge pull request #8036 from paprka/fixfueltank
...
Fixes practice lasers exploding fuel tanks
2015-03-02 05:54:09 -06:00
Swag McYolosteinen
d6a9d8cb8d
Merge pull request #8084 from Incoming5643/you_just_got_mulliganed_on
...
Mulligan Round Fixes/Feature Requests
2015-03-02 10:56:24 +01:00
Cheridan
8d9d45131b
Merge pull request #8004 from GunHog/RemovesXenoFunFromExperimentor
...
Replaces Xenomicrobes with Sulfuric Acid
2015-03-02 01:12:56 -06:00
Cheridan
960d3deeb0
Merge pull request #8023 from Jordie0608/youruniquenesswillbeassimilatedandthenturnedbrown
...
Fixes #7086 Job selection window width
2015-03-02 01:09:22 -06:00
Cheridan
6e68c4cb67
Merge pull request #8030 from Iamgoofball/patch-37
...
Nerfs Beepsky Smash (rip in peace)
2015-03-02 01:00:28 -06:00
Cheridan
e812f8a47b
Merge pull request #7844 from RemieRichards/DroneUpdate20-02-2015
...
Drone Skins + Drone Organic Vision Modes
2015-03-02 00:56:12 -06:00
Cheridan
78631a6958
Merge pull request #8038 from paprka/oopsjetpacks
...
fixes jetpacks as internals
2015-03-02 00:50:24 -06:00
Cheridan
90aabb4a67
Merge pull request #8077 from Iamgoofball/patch-39
...
Buffs Oxygen Blob and Radblob
2015-03-02 00:45:23 -06:00
Incoming
99431757eb
Adds a lull between when the antagonist eats it and when the new antagonists are created: 3 ~ 7 minutes (5 average)
2015-03-02 00:24:25 -05:00
Ikarrus
e974d10058
Chatlog notification of changelog updates
2015-03-01 20:56:38 -07:00
Ikarrus
f95ca85ed6
Age Restrictions for Antagonists
...
Default minimum age is 7 days.
Team Antag modes and wizard is 14 days.
Malf minimum is 30 days (Same as AI minimum age).
2015-03-01 20:40:04 -07:00
Cheridan
9f62e2c387
Merge pull request #8055 from xxalpha/xxmas
...
Removes Santa Hats from security wardrobe closets and the festivus pole from RD's office.
2015-03-01 20:04:52 -06:00
Remie Richards
14d5b559c7
Merge pull request #8072 from MrStonedOne/isee-saidtheblindman
...
Fixes #772 Toggling darkness off prevents ghosts from seeing one another
2015-03-01 22:01:35 +00:00
Incoming
0037d06cbf
Fixes a pair of instances where AssignRole() was being called unsafely and shoved a hot spoonful of sanity in there.
...
Fixes #8086
2015-03-01 16:47:58 -05:00
Incoming5643
2ff6e8ff08
Always remember to port smartly
2015-03-01 16:09:51 -05:00
Swag McYolosteinen
ba3b161572
Merge pull request #8043 from Mandurrrh/kelvingrammar
...
Fixes #7935 correct use of Kelvin without degrees.
2015-03-01 20:55:22 +01:00
Incoming
79edc1ff88
Replaces the custom "how many people are dead?" check with the one used for survival rates on round end statitistics because, lets be honest here, we know that one works.
...
Shuffles some flags around that should hopefully prevent round_converted() from running more than once. It's not a huge crisis if it does because late join antag is self capping, but still, not intended behavoir!
2015-03-01 12:13:55 -05:00
MrStonedOne
74bd002183
Adds admin alert when random events fire
...
Not sure why it took this long for this to happened.
Will only trigger on random event firing, and not when an admin triggers an event to prevent unneeded duplicate messages
Also triggers for events triggered by the wizard summon events
Logs in the game log under the GAME: heading as well
2015-03-01 06:50:51 -08:00
MrStonedOne
64851a016f
Adds blob overmind cursor mob to ghost darkness vision
...
Thanks @Ricotez
Also tweaks the wording of related verbs, procs, and variables to match
Moves the scope of the ghostimages (now ghost darkness images) var and updatedateallghostimages proc to the global space so other things can access them
2015-03-01 04:07:10 -08:00
Razharas
e505acf591
Merge pull request #7985 from Jordie0608/tgstationisaparadiseforlumberjacks
...
Cleanup of changelog related files
2015-03-01 13:20:33 +03:00
