48ad48acce
Add a fail message to unbuckling, breaking out of cuffs and closets and performing CPR.
2014-11-04 20:30:04 +01:00
b77e2fc46a
Conflicts solving
2014-11-04 20:24:52 +01:00
40e093de50
Merge branch 'master' of https://github.com/tgstation/-tg-station into firefighting
2014-11-04 10:52:46 -08:00
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
4d7d8fa423
derp...
2014-11-04 18:42:03 +01:00
1eaaf35b41
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1
...
Conflicts:
code/game/objects/objs.dm
code/modules/mob/living/carbon/human/human_defense.dm
2014-11-04 18:24:52 +01:00
3c58bf7435
Moved some things around!
...
All radios now have a keyslot var (replacing keyslot1 for headsets).
- recalculateChannels() proc moved to radios instead of just headsets.
- Removed the duplicated recalc proc for borg radios.
- Moved the translate vars to radios as well.
- The syndicate headset subtype has been removed in favor of using the
make_syndie() proc on it instead.
2014-11-04 10:46:18 -06:00
28b1d8bef0
fixes grille rebuilding, removes damaging from tables, adds better sound effects for smashing tables, adds chance to fail breaking reinforced tables as hulk
2014-11-03 20:41:40 -08:00
604bc648ff
Gives Traitor AIs the Syndicate Channel!
...
This PR is intended to support #5283 .
- Traitor AIs, when set as a traitor, will be given a new internal radio
calibrated to hear and transmit to the encrypted syndicate frequency.
Since traitors can buy a headset key for getting the Syndicate Channel,
Traitor AIs can get one too, as they cannot purchase their own TC items.
2014-11-03 21:59:36 -06:00
5720b29130
final commit for now for glass tables
2014-11-03 19:26:33 -08:00
b8f0ef4efe
Merge pull request #5541 from xxalpha/cigarettes
...
New Cigarette Packs
2014-11-03 18:49:29 -08:00
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
f268f3d357
Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables
2014-11-03 18:31:43 -08:00
df13b0d840
Merge pull request #5591 from hornygranny/OOPgularity3
...
improved deconstruction, singularity stuff
2014-11-03 20:20:55 -06:00
d5b8ed3155
Merge pull request #5460 from paprka/rdturtle
...
Adds RD turtleneck and updates whimsy
2014-11-03 18:18:18 -08:00
e662932bd1
Merge pull request #5512 from RemieRichards/AcidBurns
...
Acid Rework
2014-11-03 18:11:49 -08:00
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
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
d81eb696c4
Merge pull request #5570 from xxalpha/noslipfloor
...
High-traction Floor
2014-11-03 17:37:20 -08:00
bf9679d6cb
Merge pull request #5581 from tkdrg/spacefactory13
...
Constructable conveyor belts!
2014-11-03 17:33:32 -08:00
8b4ab665cb
Merge pull request #5490 from tkdrg/hiasl
...
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
7e4688e3f6
Merge pull request #5427 from paprka/littlejanitorthings
...
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
b32e9cff12
Merge pull request #5621 from tkdrg/damnoldcoders
...
Moves around some vars
2014-11-03 17:15:54 -08:00
fa4fa09149
Merge pull request #5569 from Menshin/runtimes_roundsup
...
Alek2ander weekly runtimes fixing
2014-11-03 17:13:18 -08:00
6e11157661
Merge pull request #5520 from paprka/minerscrubs
...
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
0a0cd991de
Merge pull request #5516 from paprka/telestunfix
...
fixes telebaton stunning borgs
2014-11-03 17:11:39 -08:00
85016d7f38
Merge pull request #5493 from tkdrg/pullingyourleg
...
Makes pull into a mob verb
2014-11-03 17:10:34 -08:00
9c11d9fa25
All mechs have a melee attack now, the force of non combat mechs is 5.
...
Changing the mech melee attack code to be more object oriented. Creating mech_melee_attack() proc for atom and overidden in its children.
Mechs can now hit windoors with their melee attack. (they can still open them by bumping)
2014-11-03 21:40:25 +01:00
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
4cfa4ec04b
windows break at stage 5
2014-11-03 11:37:08 -08:00
46a3170b2a
Firefighting changes:
...
-Firesuit level protection will not entirely protect you from being set on fire. You will gain small amounts of heat while on fire.
-Overhauls the Atmos Water Backpack into a more effective firefighting tool
-Adds a secure ATMOS closet containing said atmos water backpack to the code, but is not on the map as the backpack already exists in the ATMOS hardsuit object at this moment
2014-11-03 10:25:12 -08:00
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
5a237e6854
Merge branch 'master' of https://github.com/tgstation/-tg-station into PipenetRevamp
2014-11-03 08:34:47 -03:00
8aa5a137c5
Pipenet revamp
...
-Removed the pipenet network datum, now it will all be done with the pipeline datum
-All atmos pipes and machines will always have a pipeline datum
-Moved the valves to the binary subtype and the portable connectors to the unary subtype
-The pipe vents (who were barely used in three spots of the map) are removed, the map slots will replaced with outlets
-Fixes some bugs of pipenet disconnection, mostly on explosions
-Cleaned a bit the copypaste of construction.dm of pipes
-Removed the ID restrictions of digital valves and the frequency (both unused)
2014-11-03 08:21:31 -03:00
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
1288c7da81
cleaned up procs, added glass table smashing
2014-11-02 16:53:15 -08:00
8b49caa5ee
Fixes typos and show messages. Fixes attack animation code.
2014-11-03 01:06:02 +01:00
3f30912c51
WIP - Adding attack animation to most attacks.
...
Fixing a couple "for(......) show_message()".
2014-11-02 22:50:58 +01:00
ffd02c45c2
second commit for table redoing
2014-11-02 10:52:25 -08:00
6e29ad75d5
Merge pull request #5492 from tkdrg/nofunallowed
...
You can no longer put transit tube pods in a station that already has one
2014-11-02 11:56:20 -06:00
7ebc4bb742
Merge remote-tracking branch 'upstream/master' into pullingyourleg
...
Conflicts:
code/modules/mob/mob.dm
2014-11-02 14:40:37 -03:00
51eae4c5a2
Merge pull request #5601 from phil235/ObjVerbCheckFix
...
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
71fe1bf00b
Merge pull request #5597 from phil235/IdMsgFix
...
Fix the 'show ID' message.
2014-11-02 11:10:16 -06:00
a97c4de972
Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)
...
Removes force from pipes
Removes unused turf var icon_old
Moves pass_flags to /atom/movable
2014-11-02 14:10:03 -03:00
4f58312d76
Merge pull request #5596 from phil235/LipstickFix
...
Fix for #5588
2014-11-02 10:39:21 -06:00
ef29aaef57
Merge pull request #5598 from phil235/PDAsoundFix
...
Fix lack of sound when non-silent PDA receives a message.
2014-11-02 10:26:28 -06:00
05b2146a7d
Fix anchored issues with alien nests
...
Because standardization is poison it seems
Also fix an issue where pixel_y could get permanently set to 6.
2014-11-02 05:46:03 -08:00
85de5f7cd5
initial commit for table overhaul
2014-11-01 23:57:01 -07:00
30841b5f37
Merge remote-tracking branch 'upstream/master' into hiasl
...
Conflicts:
code/modules/research/message_server.dm
2014-11-01 20:04:26 -03:00
8202bde945
Even the damned statue !!!
2014-11-01 22:06:59 +01:00
phil235
Menshin
Ergovisavi
GunHog
paprka
hornygranny
Cheridan
Remie Richards
Aranclanos
tkdrg
MrPerson
Menshin