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
f7342415c1
Merge pull request #7959 from phil235/AttackSelfTKFix
...
A bunch of fixes
2015-02-25 19:54:36 -08:00
f0f509bc0b
Merge pull request #7951 from Incoming5643/max_min_same_thing
...
population cap hotfix
2015-02-25 19:53:18 -08:00
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
4e0ce8a452
Adds deathsquad corgis.
2015-02-25 01:16:17 -06:00
588c79873f
Merge pull request #7562 from Iamgoofball/drugs
...
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
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
0bf9605888
spellang councet
2015-02-24 16:19:21 -05:00
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
01720fc486
Adding a warning comment
2015-02-24 17:13:54 +01:00
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
712f599ccf
Fixes restrained message spam by giving it a cooldown.
2015-02-24 14:32:31 +01:00
76b9fbb874
popcaphotfix: misused a max that could have rendered the hard popcap useless
2015-02-23 23:34:17 -05:00
722c4cb1ef
re-adds GOTTAGOFAST, renames the current gottagofast to IGNORESLOWDOWN, adds GOTTAGOREALLYFAST for meth
2015-02-23 19:35:58 -08:00
e889ee7a42
Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding
...
Items Embedding in Limbs
2015-02-24 01:22:01 +03:00
08fd5d5146
Merge pull request #7914 from paprka/jetpax
...
Fixes breathing from jetpacks
2015-02-23 12:59:49 -08:00
ac5fc9b044
Merge pull request #7544 from Incoming5643/popcapgames
...
Adds optional population caps
2015-02-23 17:20:02 +01:00
984b7cb8f6
Merge pull request #7738 from Incoming5643/mediborg_inbuiltstretcher
...
Mediborg Improvement Drive: Roller Robo Da
2015-02-23 17:10:43 +01:00
8439310170
Fixes xeno pouncing messages being bold green for human viewers.
2015-02-23 14:09:16 +01:00
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
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
b439b838d3
jetterpecks
2015-02-22 13:24:26 -08:00
edcfae62d3
spellfix
2015-02-22 21:32:39 +11:00
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
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
e9a943218c
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
...
Add the incapacitated proc to mobs to check for stat, stun, weakened, paralysis, restrained. And replacing those checks by that new proc in some places.
2015-02-21 14:49:47 +01: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
383e4e7111
Merge pull request #7792 from Menshin/regen_statis_tweaks
...
Regenerative statis tweaks
2015-02-19 13:07:24 -08:00
42fe551665
Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-02-19 18:16:33 +00: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
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
90e0a00298
Merge pull request #7786 from phil235/SiliconGrabFix
...
No more silicon grabbing.
2015-02-18 21:48:30 -08:00
e94e94a5e2
fixes #7827
2015-02-19 00:23:56 -05:00
30eb4e342a
Merge pull request #7652 from Incoming5643/Circumstantial_Dickpixel
...
Tactical dickpixel™ removal
2015-02-18 21:07:08 +01:00
1ac0c26655
Merge pull request #7770 from phil235/AnimationsFix
...
Floating animation and life() fixes.
2015-02-18 02:27:28 -06:00
89df7f351d
* Getting into regenerative statis now put the changeling into unconscious state
...
* Fixed reviving not working
2015-02-17 22:04:58 +01:00
dcd20969a7
Merge pull request #7730 from Incoming5643/mediborg_tools
...
Mediborg Improvement Drive: Tool Time
2015-02-17 19:11:28 +01:00
6ebd5976f5
Merge pull request #7729 from Incoming5643/mediborg_gauze
...
Mediborg Improvement Drive: The man in gauze
2015-02-17 18:17:59 +01:00
e09dd08054
Remove aliens grabbing silicons.
2015-02-17 18:03:24 +01:00
df107499d1
No more silicon grabbing.
2015-02-17 14:59:12 +01:00
05e3c305ef
Fixes floating animation not updating correctly.
...
Makes life() procs more object oriented.
2015-02-16 18:56:57 +01:00
c2c015a91a
Fixes conflicts, fixes casually worn uniforms looking weird
2015-02-15 13:07:06 -05:00
85ff51b3f7
Merge pull request #7753 from Cheridan/master
...
Manual Merge of #7724
2015-02-15 10:34:26 -06:00
15439b8c4e
Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
...
Conflicts:
code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
9c53764675
Merge pull request #7680 from Deantwo/ReadySpam
...
Fixes ready spam
2015-02-14 22:21:06 -06:00
b2071bfdbf
borg updates
2015-02-14 17:38:17 -08:00
066b2762d3
lots of crap
2015-02-14 17:25:45 -08:00
b67f9cec72
Merge branch 'master' of https://github.com/tgstation/-tg-station into miening
2015-02-14 17:08:39 -08:00
Cheridan
hornygranny
TZK13
Razharas
Remie Richards
Incoming
phil235
Iamgoofball
Swag McYolosteinen
paprka
Jordie0608
phil235
Menshin
paprka