88cc21cb6d
Merge pull request #7963 from Incoming5643/manage_ass
...
Updates Manage Job Slots to work with assistant slots
2015-02-28 21:28:44 +00:00
679c63a8ea
Merge pull request #7924 from Incoming5643/mulligan_rounds
...
Mulligan Rounds for Wizard/Blob/Malf
2015-02-28 21:27:18 +00:00
ef95d03a13
fixes runtime when client disconnects while a ghost.
2015-02-28 13:16:04 -08:00
b1f60a6114
GOONCHEM 5.5: MORE TOXINS
2015-02-28 12:26:34 -08:00
ff1a0d3ecd
Moves global var ghostimage over to a static var on ghosts
2015-02-28 10:35:20 -08:00
3b2963dcab
More changes, more bugs
2015-02-28 10:19:52 -08:00
0257dbfc9a
Fixes #772 Toggling darkness off prevents ghosts from seeing one another.
...
Abuses client.images to get around the issue with flat see_invisible scaling not allowing for both being able to see ghosts while not seeing darkness layers.
2015-02-28 10:12:16 -08:00
c4b78e37af
Merge branch 'master' of https://github.com/tgstation/-tg-station into DroneUpdate20-02-2015
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/simple_animal/friendly/drone.dm
icons/mob/head.dmi
2015-02-28 16:19:13 +00:00
8cee97f54f
Merge pull request #7942 from dannno/nothingmatters
...
THE OWL RETURNS
2015-02-28 16:06:35 +00:00
49fc3d290c
move alt_desc to obj/item/clothing
2015-02-28 11:02:58 -05:00
862c66ac63
rebalances thermals
2015-02-28 05:12:27 -08:00
b95f44f235
Loads of pyrotechnics changes
2015-02-27 21:16:10 -08:00
6a4b912d3e
Pyrotechnics changes
2015-02-27 20:38:04 -08:00
926c2f7413
Merge pull request #8027 from Iamgoofball/patch-36
...
I apparently added morphine to Deus. This was not intended.
2015-02-28 07:00:27 +03:00
1b866bad83
Merge pull request #8024 from Iamgoofball/patch-35
...
Fixes the meth recipe
2015-02-28 06:59:56 +03:00
f6e18e9e45
Re-adds the shot glass sprites.
2015-02-27 17:14:50 -06:00
f9ebb2cff7
Merge remote-tracking branch 'upstream/master' into traymesons
...
Conflicts:
code/modules/research/designs.dm
icons/mob/eyes.dmi
icons/obj/clothing/glasses.dmi
2015-02-27 21:15:01 +00:00
027eccedbc
conflicts fixed
2015-02-27 14:01:42 -05:00
fa0e5344ef
Removes sugar effects.
2015-02-27 19:01:32 +01:00
5e9e6a0264
Embedded object removal added to revive() changeling revive and fleshmend
2015-02-27 17:57:22 +00:00
b233b54cab
Merge pull request #8006 from MrStonedOne/SomeThingThatEndsInYFollowedByTwoNumbers
...
Panic bunker + new player notification configs
2015-02-27 16:17:20 +03:00
e0aa321ca0
Merge pull request #8037 from paprka/blackchowder
...
Fixes dark matter server crashing, retools dark matter to be less bad
2015-02-27 15:30:17 +03:00
8807c433ae
modifies dark matter
2015-02-27 04:21:56 -08:00
5938cc7325
fixes practice lasers exploding fuel tanks
2015-02-27 03:58:25 -08:00
12e4047cbe
Merge pull request #7988 from Menshin/protalathe_matcheck_fix
...
Fixes protolathe incorrectly checking material amount
2015-02-27 11:11:52 +03:00
78e504f33e
Merge pull request #7994 from Incoming5643/colormesurprised
...
Fixes podmen always being sickenly off white upon creation
2015-02-27 11:10:55 +03:00
a8cedc14ef
Merge pull request #7969 from optimumtact/nanouibeginnings
...
Auto load required nanoui files on client login
2015-02-27 10:36:13 +03:00
081b957a48
Nerfs Beepsky Smash
2015-02-26 20:52:31 -08:00
16f319bffd
I apparently added morphine to Deus. This was not intended.
2015-02-26 20:27:14 -08:00
7a990a0a28
Fixes the meth recipe
...
phosphorus
2015-02-26 18:22:22 -08:00
cf5d5794c7
Adds failed login message for panic bunker.
2015-02-26 16:54:20 -08:00
5529222b62
Fixes guests being allowed to connect while panic bunker is active
...
I was tempted to move all the panic bunker shit to isbanned(), but doing so would mean adding yet ANOTHER query that gets run on every connection, and run for every player on world restart.
That just seemed like not worth the effort to just make panic bunker trigger a little bit earier.
2015-02-26 16:48:43 -08:00
b86e79875c
readds verb for rolldown
2015-02-26 16:10:03 -08:00
af4c2d86d6
Tweaks panic bunker verb logic a little bit
...
Allows toggling even if the database is not connected, alerts admins instead.
2015-02-26 16:02:26 -08:00
b39f120f4b
Makes the irc new player alert option behave like irc admin pm notices
...
It will only trigger if the new player alert is enabled for admin display and no valid non-afk admins are on to see it.
2015-02-26 14:07:56 -08:00
9b1fa2479b
conflict fixing + changelog
2015-02-26 16:48:11 -05:00
626bb9ffcc
THE OWL RETURNS: PART 3: ESCALATION
...
- adds The Owl hardsuit (admin spawn only, reskinned nukeop suit)
- changes nuke op hardsuit toggle proc to be more general, for more unique hardsuits
- removes armor from owl/griffin wing costumes (it didn't make sense anyways)
2015-02-26 13:59:09 -05:00
7171cd252b
Fixes no blood dna on Mulebot and its blood tracks.
...
Fixes putting buckled mobs onto morgue trays.
Fixes mob pixel offset when unbuckled from roller bed.
Fixes blood trail appearing when pulling a patient on a roller bed.
Fixes other minor stuff.
2015-02-26 19:31:55 +01:00
1e8324c3c5
Exposes all embedding related multipliers as variables and definitions. Only items of throw_speed 4 or more can embed now, Explosions force their object to be thrown at 4, this throw_speed threshold is ON TOP of needing to be a can_embed() object.
2015-02-26 17:04:00 +00:00
c6866b0369
Merge pull request #7881 from paprka/sayycode
...
Bolded yelling and missing green span
2015-02-26 17:59:17 +01:00
a3aa6ff4bf
Reworked slime/death() and slime/gib().
2015-02-26 16:03:47 +01:00
d9856cde1f
small leftovers fix
2015-02-26 01:47:49 -08:00
6d6c568fc2
benis.
2015-02-26 01:43:07 -08:00
4f160e4833
server time for status panel
2015-02-26 20:15:15 +11:00
e4eeed69bc
Merge pull request #7976 from Jordie0608/bioterrorreportedasleastpopularformasspaceterrorism
...
Fixes bioterror chemsprayer
2015-02-26 02:08:24 -06:00
e89e925fef
removes empty new
2015-02-26 18:53:23 +11:00
2bf705deb8
Merge pull request #7884 from Incoming5643/layers4lizards
...
Added some layers so mutantrace sprites actually make sense
2015-02-26 01:47:40 -06:00
51dbce4607
Merge pull request #7982 from TZK13/Deathsquad-Corgi
...
Adds deathsquad corgis
2015-02-26 01:28:07 -06:00
5ac23f6a2d
Panic bunker + new player notification configs
...
Panic bunker! Uses the power of the database to reject new ckeys that have never connected to the server(s) before.
Admins are exempt, even while deadmin'ed, but they are also unlikely to be new ckeys except in rare cases that involve vv fuckary.
New player notification is now configurable.
Adds a optional default disabled irc notification of a players first time connecting.
2015-02-25 23:27:03 -08:00
8c86bb5031
Replaces Xenomicrobes with Sulfuic Acid
...
- Xenomicrobes replaces with Sulfuric Acid
2015-02-25 23:06:13 -06:00
Remie Richards
MrStonedOne
Iamgoofball
danno "big fucking moron" gonzales
paprka
Razharas
TheVekter
xxalpha
phil235
Swag McYolosteinen
Jordie0608
Cheridan
GunHog