Commit Graph

3851 Commits

Author SHA1 Message Date
Cheridan
d218256e32 Merge pull request #7854 from phil235/LifeProcsDuplicateFix
Life procs duplicate fix
2015-03-02 09:16:09 -06:00
Cheridan
00be838acc Merge pull request #8011 from Jordie0608/CMOSisforscrubskeepyourcomputerclocksavedinRAM
Server time for status panel
2015-03-02 08:32:48 -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
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
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
Razharas
111cb2a009 Merge pull request #8018 from phil235/BugFixA
A bundle of fixes
2015-03-01 06:44:02 +03:00
MrStonedOne
a26839cde0 Adds a new ghost verb to toggle ghost visibility
For users who depended on the old buggy version of see darkness.

reworks seedarkness logic to mash well with the new verb, looks nicer too
2015-02-28 13:43:55 -08:00
Remie Richards
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
MrStonedOne
ef95d03a13 fixes runtime when client disconnects while a ghost. 2015-02-28 13:16:04 -08:00
MrStonedOne
ff1a0d3ecd Moves global var ghostimage over to a static var on ghosts 2015-02-28 10:35:20 -08:00
MrStonedOne
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
Remie Richards
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
phil235
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
Swag McYolosteinen
c6866b0369 Merge pull request #7881 from paprka/sayycode
Bolded yelling and missing green span
2015-02-26 17:59:17 +01:00
phil235
a3aa6ff4bf Reworked slime/death() and slime/gib(). 2015-02-26 16:03:47 +01:00
Jordie0608
4f160e4833 server time for status panel 2015-02-26 20:15:15 +11:00
Cheridan
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
Cheridan
51dbce4607 Merge pull request #7982 from TZK13/Deathsquad-Corgi
Adds deathsquad corgis
2015-02-26 01:28:07 -06:00
hornygranny
f7342415c1 Merge pull request #7959 from phil235/AttackSelfTKFix
A bunch of fixes
2015-02-25 19:54:36 -08:00
hornygranny
f0f509bc0b Merge pull request #7951 from Incoming5643/max_min_same_thing
population cap hotfix
2015-02-25 19:53:18 -08:00
hornygranny
3a762600b1 Merge pull request #7958 from phil235/RestrainedMessageSpamFix
Fixes restrained message spam by giving it a cooldown.
2015-02-25 19:52:49 -08:00
phil235
18323955a7 Merge branch 'master' of https://github.com/tgstation/-tg-station into LifeProcsDuplicateFix
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-02-25 19:01:59 +01:00
Jordie0608
28f88dd15c Cleanup of changelog related files 2015-02-26 00:57:01 +11:00
TZK13
4e0ce8a452 Adds deathsquad corgis. 2015-02-25 01:16:17 -06:00
Razharas
588c79873f Merge pull request #7562 from Iamgoofball/drugs
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
Remie Richards
b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
Incoming
0bf9605888 spellang councet 2015-02-24 16:19:21 -05:00
Incoming
93a74c9df4 whoops, missed a debug message 2015-02-24 16:14:35 -05:00
Incoming
cbcc52beeb Updates Manage Job Slots to work with assistant slots
Any (non-silicon) job can now be set to be an unlimited slot job from Manage Job Slots

People will be allowed to join as assistant if no other jobs are availible

Removes a redundant sanity check from AssignRole()
2015-02-24 16:06:36 -05:00
hornygranny
84296b10fa Merge pull request #7930 from phil235/XenoPounceMessageFix
Fixes xeno pouncing messages being bold green for human viewers.
2015-02-24 10:12:03 -08:00
phil235
01720fc486 Adding a warning comment 2015-02-24 17:13:54 +01:00
phil235
79de9615dc Fixes not being able to prime grenade, toggle lamps and other attack_self things with TK.
Fixes the blobbernaut death animation looping.
Fixes armchair layer being above ghost layer.
Fixes chloral hydrate metabolization rate (and 2 other reagents)
Fixes a typo in closet/attack_self() .
2015-02-24 16:36:40 +01:00
phil235
712f599ccf Fixes restrained message spam by giving it a cooldown. 2015-02-24 14:32:31 +01:00
Incoming
76b9fbb874 popcaphotfix: misused a max that could have rendered the hard popcap useless 2015-02-23 23:34:17 -05:00
Iamgoofball
722c4cb1ef re-adds GOTTAGOFAST, renames the current gottagofast to IGNORESLOWDOWN, adds GOTTAGOREALLYFAST for meth 2015-02-23 19:35:58 -08:00
Razharas
e889ee7a42 Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding
Items Embedding in Limbs
2015-02-24 01:22:01 +03:00
hornygranny
08fd5d5146 Merge pull request #7914 from paprka/jetpax
Fixes breathing from jetpacks
2015-02-23 12:59:49 -08:00
Swag McYolosteinen
ac5fc9b044 Merge pull request #7544 from Incoming5643/popcapgames
Adds optional population caps
2015-02-23 17:20:02 +01:00
Swag McYolosteinen
984b7cb8f6 Merge pull request #7738 from Incoming5643/mediborg_inbuiltstretcher
Mediborg Improvement Drive: Roller Robo Da
2015-02-23 17:10:43 +01:00
phil235
8439310170 Fixes xeno pouncing messages being bold green for human viewers. 2015-02-23 14:09:16 +01:00
hornygranny
a5a7b590d3 Merge pull request #7866 from phil235/PullBuckleFix
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
2015-02-22 20:18:54 -08:00
hornygranny
c0c8a739e2 Merge pull request #7721 from paprka/miening
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
paprka
b439b838d3 jetterpecks 2015-02-22 13:24:26 -08:00
paprka
e68a4027b2 double exclaimation points 2015-02-22 03:50:40 -08:00
Jordie0608
edcfae62d3 spellfix 2015-02-22 21:32:39 +11:00
Incoming
59547b56a5 Procs out the mutant bodyparts code more jucidiously so we don't have to call update_body every time you put a suit on.
Fixes a bitflag I missed that was causing some confusing behavoir
2015-02-21 21:07:05 -05:00
Incoming
6843562301 Added some layers to allow for accurate "3D" placement of otherwise obtrusive mob features like tails or weirdly shaped heads. In addition exosuits that hide the uniform will now also hide a lizards tail, and masks that hide the face will push a poor lizards nose in so we don't see it clipping out the front. of the damn thing. 2015-02-21 19:34:10 -05:00
Remie Richards
897df7999d Optimises a loop 2015-02-21 17:14:47 +00:00
Remie Richards
1d63720e4a Removes unnecessary resource hog, It's not even needed, I'm a derp. 2015-02-21 16:41:28 +00:00