paprka
40cdf3ffec
swat mask overhauls and such
2014-11-13 18:36:30 -08:00
paprka
3fb5d14468
Merge branch 'master' of https://github.com/tgstation/-tg-station into EATITFATTY
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
2014-11-10 11:43:46 -08:00
hornygranny
d39265bb55
Merge pull request #5717 from phil235/FireaxecabinetBulletFix
...
Fireaxecabinet bullet fix
2014-11-10 08:22:38 -08:00
Swag McYolosteinen
9893fbc86f
Merge pull request #5645 from Ergovisavi/firefighting
...
Firefighting changes
2014-11-10 16:55:38 +01:00
paprka
9af72bda1f
compile fixes
2014-11-09 15:01:46 -08:00
paprka
0ffba02112
Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables
...
Conflicts:
_maps/map_files/MetaStation.v39K.dmm
_maps/map_files/tgstation.2.1.3.dmm
code/game/objects/structures/tables_racks.dm
2014-11-09 14:53:19 -08:00
Ergovisavi
481a282ca8
Adds NODROP to the Atmos watertank nozzle. I have no regrets.
2014-11-09 13:56:12 -08:00
paprka
32e9cd70c4
maskes
2014-11-09 13:46:30 -08:00
Ergovisavi
2c74fc8dbb
-Adds secure atmos closets to Atmos
...
-Removes a redundant check in water's obj reaction, add's a "cooling power" var that determines how effective it is at cooling off hotspots
-Modifies extinguishers a bit to have more options, affect more tiles, change the cooling temperature of the water inside of it, etc
-Makes the water backpack for atmos even more robust at fighting fires with a 5 tile spread, removes converting oxygen to nitrogen on Nanofrost, made the resulting end of a firefight annoying as the atmos tech would have to get an oxygen canister
-Makes racks use Move() to put objects on top of them instead of just changing the loc, in order to stop nozzles/misters from getting on them
2014-11-09 11:16:58 -08:00
Cheridan
86d0422881
Merge pull request #5739 from hornygranny/lattices
...
lattice and grille deconstruction refactor
2014-11-08 21:21:53 -06:00
hornygranny
e392609b6f
Merge pull request #5425 from Menshin/meteor_redux
...
Meteors redux
2014-11-08 15:24:44 -08:00
Menshin
c724b54892
* Fixes meteors infinigibs and infinisplosions ( #5226 )
...
* Made meteors more threatening
* Added an ultra rare station buster Tunguska meteor
* Made admin-spawned meteor not instantly delete
* Added several types of meteor waves : normal, threatening, catastrophic which are randomly choose at wave start
* Meaty ores now spawn blood on tiles instead of busting them
* Differentiates regulars and reinforced girders ex_act
* Changelog included
2014-11-08 14:43:48 +01:00
Ergovisavi
9c1366d65f
Adds a new define for temperature protection for more robust firefighting gear
...
Adds Atmos Firesuits, Atmos Firesuit Helmets, sprites for all the firefighting gear etc
2014-11-08 02:14:37 -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
Hornygranny
c8ffcf51ae
lattice and grille deconstruction refactor
2014-11-07 13:36:28 -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
phil235
bc5754b378
adding diagonal attack animation.
2014-11-07 15:42:07 +01:00
paprka
d76e4f62e5
added deconstructing
2014-11-06 18:01:19 -08:00
phil235
2a3098d5a8
Fix
2014-11-07 00:39:19 +01:00
phil235
e86c45b190
Removing some "text(...)" stuff.
...
Little fixes in closets.dm
Adding bullet_act, blob_act and ex_act to fireaxecabinet so it drops the axe when destroyed. You can now break the cabinet's glass with projectiles (with damage >=15).
Adding ex_act to extinguisher cabinet so it sometimes drops the extinguisher when destroyed.
2014-11-07 00:28:24 +01:00
Daniel
13d955ed47
Fixed #3752
2014-11-06 01:55:57 +01: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
Ergovisavi
40e093de50
Merge branch 'master' of https://github.com/tgstation/-tg-station into firefighting
2014-11-04 10:52:46 -08: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
paprka
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
paprka
5720b29130
final commit for now for glass tables
2014-11-03 19:26:33 -08:00
paprka
f268f3d357
Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables
2014-11-03 18:31:43 -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
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
7e4688e3f6
Merge pull request #5427 from paprka/littlejanitorthings
...
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -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
85016d7f38
Merge pull request #5493 from tkdrg/pullingyourleg
...
Makes pull into a mob verb
2014-11-03 17:10:34 -08:00
Hornygranny
4cfa4ec04b
windows break at stage 5
2014-11-03 11:37:08 -08:00
Ergovisavi
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
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
paprka
1288c7da81
cleaned up procs, added glass table smashing
2014-11-02 16:53:15 -08:00
phil235
8b49caa5ee
Fixes typos and show messages. Fixes attack animation code.
2014-11-03 01:06:02 +01:00
phil235
3f30912c51
WIP - Adding attack animation to most attacks.
...
Fixing a couple "for(......) show_message()".
2014-11-02 22:50:58 +01:00
paprka
ffd02c45c2
second commit for table redoing
2014-11-02 10:52:25 -08:00
Cheridan
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
tkdrg
7ebc4bb742
Merge remote-tracking branch 'upstream/master' into pullingyourleg
...
Conflicts:
code/modules/mob/mob.dm
2014-11-02 14:40:37 -03:00
MrPerson
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
paprka
85de5f7cd5
initial commit for table overhaul
2014-11-01 23:57:01 -07:00
Menshin
8202bde945
Even the damned statue !!!
2014-11-01 22:06:59 +01:00
phil235
128c9222e5
Adding checks for stun, restrained to many object verbs.
...
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
Hornygranny
5815d7e011
grilles are now damaged by thrown items
...
disposalpipes deconstruction
atmos pipes deconstruction
2014-10-31 18:26:42 -07:00
