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
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
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
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
d53163bded
Adds an onboard roller bed dock that the mediborg can deploy wherever they need for on the spot triage/transportation/surgery/kidnapping. It can only hold one roller bed, but starts with one. This isn't regeneratable, so you can be a dick and steal the borg's bed and they'll have to go back to medbay for a replacement.
2015-02-14 17:52:38 -05:00
6de520bbb2
Merge pull request #7710 from phil235/JitterFix
...
Add a do_jitter_animation proc
2015-02-14 16:23:18 -06:00
bc2c692825
Adds a full assortment of surgery tools to the mediborg
...
Mediborgs won't accidentally slice up people if they use the wrong tool
Mediborgs won't fail surgery steps
2015-02-14 14:04:26 -05:00
711d306048
missed a bit of the commit. You know what they say, measure once, commit twice.
2015-02-14 13:52:36 -05:00
2885470c50
Adds gauze to Mediborgs, it can be regenerated in chargers much the same as the engiborgs materials
2015-02-14 13:45:23 -05:00
135293bedf
Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
...
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
2f89cb6440
Having objects embedded in your limbs causes extra bleeding on top of the bleeding caused by the damage.
2015-02-14 10:57:12 +00:00
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
d519de5018
Added embedded items to self examining. Allows embedded items to be removed from yourself via links in self examining, this hurts. Adds can_embed(). Reworks help_shake_act().
2015-02-14 01:31:40 +00:00
5b7a0b0358
Fixed the jitter effect of the taser (it was broken). Hulks now don't jitter when stunned but scream. Humans and monkeys jitter immediately after getting tazed and only fall after 2 seconds.
2015-02-13 22:53:47 +01:00
281f42b1fe
Add a do_jitter_animation proc to do the jitter animation immediately w/o having to wait for life.dm().
2015-02-13 20:49:41 +01:00
34ced43f45
Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars!
2015-02-13 12:59:02 +00:00
0d211471b8
Merge pull request #7662 from Menshin/admin_blood_healing
...
Fixes admin healing not giving blood back.
2015-02-12 16:13:22 -06:00
Razharas
Remie Richards
hornygranny
Iamgoofball
Swag McYolosteinen
phil235
paprka
Jordie0608
Cheridan
phil235
Menshin
Incoming
paprka