e2554c55e6
Merge pull request #8147 from Cheridan/master
...
Manual Merge of #7607
2015-03-04 00:39:34 -06:00
56b0c321ac
Merge branch 'BlobReroll' of git://github.com/RemieRichards/-tg-station into RemieRichards-BlobReroll
...
Conflicts:
code/game/gamemodes/blob/overmind.dm
2015-03-04 00:33:44 -06:00
aa8565ff9f
Merge pull request #8106 from Ikarrus/preserveobjectives
...
Preserve Objectives when admins remove antag status
2015-03-04 00:13:23 -06:00
3fd821bdd7
Merge pull request #7986 from phil235/TaserJitterFix
...
Fixes taser stun duration
2015-03-04 00:01:49 -06:00
15bc4760a7
fixes
2015-03-03 21:46:38 -08:00
b98c5584df
NEWCRIT + other changes
2015-03-03 21:35:30 -08:00
39cccb82e4
Merge pull request #8123 from Ikarrus/randomspawns
...
Randomizes Order of Job Spawn Points
2015-03-03 22:57:16 -06:00
12d677a97b
Fixes HydroTray Lights sprites.
2015-03-04 02:08:34 +01:00
83cb66e3a3
Prevents centcom from sending the nuke code to a station that already defeated the blob (because you know they'd still blow themselves up)
2015-03-03 19:49:36 -05:00
44d30afd20
Hotfix for Blob mulligan rounds. WHOOOOOPS
2015-03-03 19:42:01 -05:00
db1b40c5ca
The living crew and time checks are now both config options.
2015-03-03 17:49:46 -05:00
f5279273f1
Fixes many checks in construction from stacks, so you can no longer build two girders on top of each other for example.
2015-03-03 23:43:17 +01:00
6de8b0bd0c
Enforces :3 on docile slimes, gives newly sentient creatures some direction on not wasting their creators, and fixes spelling errors
2015-03-03 17:12:46 -05:00
8192ea7e06
Removes the paths to get skeletons and zombies in normal play but also does not nerf them. They can still be found through a few very rare mutation chances (I think?) and wizbiz.
2015-03-03 16:55:02 -05:00
c28d8ff7d0
Adds the ability for admins to "take the shot" and end rounds at their discretion. This is behind a two confirmation gate with a 20 second reflection period between them. All this is logged.
...
When mulligan antag is set to kick in, the suggestion for admins to end the round if they feel enough has happened is given. The option can also be found on the check antagonist panel.
The check antagonist panel will show what the muligan roundtype is if it exists.
If absolutely no one wants/can be the midround antags, the round ends there.
The round will end no matter what if the primary antagonist survived over an hour before biting it (unless the shuttle is already past the point of no return, in which case a peaceful ending takes priority)
Adds force_ending to VV editing protection, to avoid admins trying to shinanigans it on.
2015-03-03 16:39:01 -05:00
bb10824737
Improvised heating fix: Fixes dough recipe from egg + 15u flour beaker.
...
Adds a limit to how hot the beaker reagents can be heated. (no hotter than the heat source)
moving reagent_containers/attackby() to reagents/reagent_containers.dm for better visibility.
2015-03-03 22:35:11 +01:00
d36488e5a2
Merge branch 'master' of https://github.com/tgstation/-tg-station into NecromanticStone
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
icons/obj/wizard.dmi
2015-03-03 20:58:38 +00:00
f5e1b851dc
Updating from the git web interface is a bad idea, you shouldn't do it!
2015-03-03 15:50:40 -05:00
2d70141cd8
Allows admins (or coders if worn icons go the way of inhands) to specify an alternate file to load worn states from.
2015-03-03 20:23:26 +00:00
a028062624
Skeletons and zombies lose temperature immunity and radiation immunity, reducing how awesome they are in the face of their relative ease of access. They still don't breathe or have blood.
2015-03-03 14:46:32 -05:00
64d0af336d
Merge pull request #8099 from Incoming5643/doublemint_heads
...
Fixes duplicated heads
2015-03-03 21:32:46 +03:00
2499ed82f4
Adds the ore satchel of holding
2015-03-03 07:26:58 -05:00
d6eb8ec1fe
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-03 13:26:45 +01:00
90e46f35bb
Fixes irc alerts of adminhelps not showing the ckey
...
Also fixes irc alerts of new players having the source split up in the announcement messages
2015-03-03 04:05:08 -08:00
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
c2290c6c5c
Merge pull request #7913 from phil235/NewPlants
...
Adds new plants to botany
2015-03-03 11:23:32 +01:00
e6e2ec2809
Readds changelog popup as a config option
2015-03-03 19:51:35 +11:00
3bd4a47e74
Conversions and De-conversions briefly renders you unconscious
...
Getting converted or de-converted from a rev, gangster, or cultist will knock you out for a few seconds. This is to stop them from running around, attacking people, yelling and gives them a brief moment to take in what just happened to them.
2015-03-03 00:54:38 -07:00
e7109f984f
knockout on conversion
2015-03-03 00:42:11 -07:00
665afe10e1
Merge pull request #8104 from Ikarrus/changelognotify
...
Chatlog notification of changelog updates
2015-03-03 10:36:57 +03:00
4d25d10d91
Increased chance of deconversion when applyinb brute force to head. The more hurt they are, the more likely they are to deconvert.
2015-03-03 00:30:29 -07:00
9b28452bfe
Makes Gang mode functional again
...
I'm going on vacation soon so I thought I might as well bring this game mode back up to at least a minimally functional state before I go.
A lot of features (Gang membership visibility, conversion pens, weapons, deconversion methods) have been stripped out for now. I gave gang bosses uplinks in the meantime.
It's basically rev vs rev right now, but the victory conditions with the recallers are still there. I'll work on adding more stuff after I return from my vacation.
2015-03-02 23:46:46 -07:00
a07f6e6bfa
Merge pull request #8103 from Ikarrus/antag_babbies
...
Age Restrictions for Antagonists
2015-03-03 09:02:52 +03:00
e85e010bd4
Cleanup: Removed an unnecessary comma
2015-03-02 22:37:27 -07:00
3422390c94
fixes Ragin' Mages making only 1 mage
2015-03-02 21:08:51 -08:00
3964cb3126
Adds heart attacks properly.
2015-03-02 20:50:48 -08:00
95ee4a7d43
Sanity check
2015-03-02 22:47:53 -05:00
c62d387a1d
Randomizes Order of Job Spawn Points
...
The ticker's setup() will shuffle the list of spawn points, so jobs won't always predictably spawn bottom-up and left-to-right
2015-03-02 20:01:36 -07:00
c52a630a17
Fixes GhostPDA bug making it show in lobby.
2015-03-02 20:52:46 -05:00
de362eabc9
Fixing type in index comments
2015-03-02 17:43:45 -07:00
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
467e102b49
Fixes trash disappearing when washed in a sink.
...
Fixes waffle trash being named "waffles".
Replacing some stat/weakened/stunned checks with incapacitated()
Fixes meat cutlets and steak not including meat type in their name (e.g. raw corgi meat cutlet)
Harvesting meat from simple animals now takes time, has a sound, and can be done with any sharp item.
2015-03-03 00:07:08 +01:00
2ec53ea6c7
Adds the second block for table climbing before the first return.
2015-03-02 16:53:15 -05:00
24dcf08b2e
Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget
...
Conflicts:
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/larva/life.dm
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/monkey/life.dm
icons/mob/screen_alien.dmi
2015-03-02 12:04:38 -08:00
539d51fb57
Merge pull request #8091 from MrStonedOne/whydidthistakesolong
...
Adds admin alert when random events fire
2015-03-02 12:02:43 -08:00
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
d2d0888432
Merge pull request #7726 from xxalpha/traymesons
...
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01:00
c063665a84
Remove unnecessary check.
2015-03-02 18:15:51 +00:00
fd958372a3
Fixed a bug.
2015-03-02 17:41:59 +00:00
cde9de9e85
merge commits
2015-03-02 12:40:16 -05:00
Cheridan
Iamgoofball
phil235
Incoming
Remie Richards
Incoming5643
Razharas
Xhuis
Miauw
MrStonedOne
Jordie0608
Ikarrus
Mandurrrh
MrPerson
hornygranny
xxalpha