hornygranny
4ff8507c85
Merge pull request #5727 from phil235/RecorderFix
...
Fixes the tape recorder. (one typo)
2014-11-08 15:07:47 -08:00
Cheridan
53bf024dbe
Merge pull request #5545 from RemieRichards/DiseaseRework
...
Disease Code Partial Rework
2014-11-08 00:17:47 -06:00
Cheridan
15b16e1f67
Merge pull request #5726 from paprka/traitorbeltthing
...
Adds disguised med analyzer to medibelts
2014-11-07 23:39:56 -06:00
hornygranny
efb3877fcf
Merge pull request #5682 from paprka/fixdefib
...
Defibrillator Hotfixes
2014-11-07 19:49:04 -08:00
Cheridan
3854ab4763
Merge pull request #5707 from Donkie/closetbudgefix
...
Fixed #3752 It won't budge!!!11
2014-11-07 20:08:38 -06:00
Remie Richards
2054cbda08
Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/human_attackpaw.dm
code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
paprka
7bde69c3a7
emagged defibs now make people gasp
2014-11-07 16:17:58 -08:00
paprka
774e82de06
Buffed weaken of safety off defibs and removed burn damage
2014-11-07 16:17:11 -08:00
Cheridan
594fd9d3e2
Merge pull request #5271 from Menshin/html_sanitization
...
Text input sanitization (take 1)
2014-11-07 13:56:20 -06:00
Remie Richards
0914b1a7cd
Merge pull request #5642 from phil235/AttackAnimation
...
Adding an attack animation to most attacks
2014-11-07 18:39:27 +00:00
Cheridan
e2bf3eca4b
Merge pull request #5705 from Donkie/batonfix
...
Fixes #5691 - Batons incorrectly giving messages
2014-11-07 10:27:09 -06:00
Cheridan
3f16a966b2
Merge pull request #5712 from xxalpha/amilli
...
Increases gold content per Robust Gold cigarette to 1
2014-11-07 10:09:54 -06:00
Cheridan
669a20df77
Merge pull request #5708 from paprka/stupidfuckup
...
Fixes utility medipen bundle for miners
2014-11-07 10:03:46 -06:00
phil235
bc5754b378
adding diagonal attack animation.
2014-11-07 15:42:07 +01:00
phil235
7ca1c48206
Fix the tape recorder.
2014-11-07 10:52:52 +01:00
paprka
e5db75d756
adds disguised med analyzer to medibelts
2014-11-06 21:36:54 -08:00
Remie Richards
c59e9ee20c
Merge pull request #5665 from phil235/CPRFailMsg
...
Add a fail message to unbuckling, breaking out of cuffs and closets and CPR.
2014-11-06 22:18:02 +00:00
Remie Richards
09e6825b5d
Merge pull request #5692 from Aranclanos/TKihateyou
...
Computers and telekinesis fix
2014-11-06 21:56:31 +00:00
xxalpha
e1a06faa9b
Increases gold content per Robust Gold cigarette to 1
2014-11-06 18:23:48 +00:00
paprka
b99499e277
fixes utility medipen bundle for miners
2014-11-05 18:02:14 -08:00
Daniel
13d955ed47
Fixed #3752
2014-11-06 01:55:57 +01:00
Daniel
059244387f
Fixed #5691
2014-11-06 01:12:15 +01:00
Aranclanos
f7ad6d9ab0
Fixes issue #1442
...
canUseTopic() will now check for telekinesis on humans, using the be_close flag.
The pop-up window will update if TK users are using the machine.
2014-11-05 13:55:31 -03:00
JJRcop
bfc62a78aa
Changes the defibrillator to use HEALTH_THRESHOLD_DEAD as the max damage it heals
...
Changes succumb to apply exactly the required amount of oxyloss to die, instead of a hard-coded 200
2014-11-04 23:48:57 -05:00
paprka
ff78a43bb7
fixes basically everything wrong with defibs right now
2014-11-04 19:33:41 -08:00
tkdrg
a0b61707a4
NTRC (PDA chatrooms) bugfixes
...
Removed operator, revamped structure, fixed a lot of bugs
Adds myself to admins.txt
2014-11-04 22:47:48 -03:00
paprka
6efb62989f
fixes defibs reviving and noclone check
2014-11-04 15:01:22 -08:00
phil235
48ad48acce
Add a fail message to unbuckling, breaking out of cuffs and closets and performing CPR.
2014-11-04 20:30:04 +01:00
Menshin
b77e2fc46a
Conflicts solving
2014-11-04 20:24:52 +01:00
phil235
74f8a08522
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation
...
Conflicts:
code/modules/mob/living/living.dm
2014-11-04 18:55:07 +01:00
hornygranny
b8f0ef4efe
Merge pull request #5541 from xxalpha/cigarettes
...
New Cigarette Packs
2014-11-03 18:49:29 -08:00
hornygranny
05539c7d13
Merge pull request #5382 from TZK13/Asteroid-Toy
...
Adds new meteor toys and space carp plushies to arcade machines
2014-11-03 18:39:16 -08:00
Cheridan
df13b0d840
Merge pull request #5591 from hornygranny/OOPgularity3
...
improved deconstruction, singularity stuff
2014-11-03 20:20:55 -06:00
hornygranny
d5b8ed3155
Merge pull request #5460 from paprka/rdturtle
...
Adds RD turtleneck and updates whimsy
2014-11-03 18:18:18 -08:00
hornygranny
e662932bd1
Merge pull request #5512 from RemieRichards/AcidBurns
...
Acid Rework
2014-11-03 18:11:49 -08:00
paprka
1b6eb8afec
Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-11-03 17:57:40 -08:00
hornygranny
de22ca7aac
Merge pull request #5354 from optimumtact/patch-1
...
Remove click delay from pipe painter and adds adjacency check
2014-11-03 17:44:29 -08:00
hornygranny
d81eb696c4
Merge pull request #5570 from xxalpha/noslipfloor
...
High-traction Floor
2014-11-03 17:37:20 -08:00
hornygranny
bf9679d6cb
Merge pull request #5581 from tkdrg/spacefactory13
...
Constructable conveyor belts!
2014-11-03 17:33:32 -08:00
hornygranny
8b4ab665cb
Merge pull request #5490 from tkdrg/hiasl
...
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
hornygranny
7e4688e3f6
Merge pull request #5427 from paprka/littlejanitorthings
...
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
hornygranny
b32e9cff12
Merge pull request #5621 from tkdrg/damnoldcoders
...
Moves around some vars
2014-11-03 17:15:54 -08:00
hornygranny
fa4fa09149
Merge pull request #5569 from Menshin/runtimes_roundsup
...
Alek2ander weekly runtimes fixing
2014-11-03 17:13:18 -08:00
hornygranny
6e11157661
Merge pull request #5520 from paprka/minerscrubs
...
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
hornygranny
0a0cd991de
Merge pull request #5516 from paprka/telestunfix
...
fixes telebaton stunning borgs
2014-11-03 17:11:39 -08:00
hornygranny
85016d7f38
Merge pull request #5493 from tkdrg/pullingyourleg
...
Makes pull into a mob verb
2014-11-03 17:10:34 -08:00
Remie Richards
c1060d95b2
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns
...
Conflicts:
code/game/atoms.dm
code/game/objects/items.dm
2014-11-03 19:38:58 +00:00
Hornygranny
4cfa4ec04b
windows break at stage 5
2014-11-03 11:37:08 -08:00
phil235
1506383b2c
Adding some missing do_attack_animation()
...
Moving do_attack_animation() proc to mob/living
Fixing the pixel offset issue from beds especially rollerbed.
Fixing the nograv bouncing stopping because of another animation being used.(lying down, jittering, attack animation)
2014-11-03 15:11:39 +01:00
Cheridan
a28abaf72a
Merge pull request #5544 from MrPerson/jesus_shut_up_aran_god_damn
...
Make buckled mobs anchored if their chair is anchored
2014-11-02 22:40:20 -06:00
