Commit Graph

137 Commits

Author SHA1 Message Date
Lzimann
233a5bba82 Hopefully fixes conflicts. 2016-06-02 22:37:18 -03:00
Lzimann
f5dd3b8623 Adds BZ gas to atmos filters. 2016-06-02 19:48:44 -03:00
Lzimann
a7c6223b7d Adds a way to filter BZ gas with scrubbers and air alarms 2016-06-02 19:23:41 -03:00
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
MrPerson
7713a547cd Canisters dump their contents when they burn up (#18043)
Fixes #16713
2016-05-30 18:53:38 -05:00
LatD
65a0027979 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-28 01:37:55 +03:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
Razharas
f4a82e7054 Makes space 250 times less potent
Fix https://github.com/tgstation/-tg-station/issues/17814
2016-05-23 05:03:50 +03:00
LatD
6e6474ee9e Imprinter origin and req lvls 2016-05-22 23:46:05 +03:00
oranges
6486b588c6 Merge pull request #17333 from nullbear/less-wetness-updates.-Ice-sliding-in-no-slips-
Wetness stuff.
2016-05-21 14:46:09 +12:00
Cheridan
23d8de67c9 Merge pull request #17445 from bgobandit/ayygentb
Adds BZ, a hallucinogenic gas. [MAP EDIT]
2016-05-19 18:14:18 -05:00
Cheridan
40c9119697 Merge pull request #17727 from Razharas/HEPipeFix
Fixes HE pipes not working in space and lava
2016-05-19 04:51:00 -05:00
bgobandit
d430ca29ab fixes the bugs of the jordie 2016-05-18 14:27:26 -04:00
bgobandit
b94ce1968b Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
2016-05-18 03:13:37 -04:00
Razharas
da40045cfa Makes space great again
Makes space heat conductive
Makes lava really heat conductive
2016-05-17 10:02:23 +03:00
Cruix
3400cf690d [s] Simple animals can no longer drag-drop people into cryo or sleepers. (#17689)
* Simple animals can no longer drag-drop people into cryo or sleepers.

* Changed sleeper/cryo fix to use IsAdvancedToolUser()
2016-05-16 18:47:52 -05:00
Razharas
0d750f5da1 Fixes HE pipes not working in space and lava
Fixes HE pipes not working in space and lava
2016-05-17 00:48:46 +03:00
bgobandit
8d1a1fe432 Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-05-10 01:14:44 -04:00
bgobandit
134b809fd1 scrubbers, human life.dm, map edits, etc 2016-05-09 18:04:20 -04:00
Core0verload
a66c2f4418 Machine/computer boards and frames refactor (#17300)
* Map Changes

* Machine/console boards and frames refactor

* More board changes
2016-05-08 12:11:18 +02:00
bgobandit
050ebb5838 begins to add BZ, hallucinogenic gas 2016-05-07 01:14:19 -04:00
nullbear
f97c8c2af4 wetness stuff 2016-05-02 06:19:28 -07:00
nullbear
3d781f1498 Implements freezie floors and buffs frostoil (#17081)
* Implements freezie floors and buffs frostoil

🆑 nullbear
rscadd: A reminder for crew to avoid mopping floors in cold rooms, as
the water will freeze and provide a dangerous slipping hazard known as
'ice'. Running on it is not recommended.
rscadd: frostoil is deemed an effective chemical for cooling down areas
in the event of a plasma fire.
:/cl:

Makes wet floors freeze in cold environments, and evaporate in warm
environments.

Makes frostoil cool the atmosphere, and make the floor wet. Typically
resulting in icy floors.

Fixes gluon grenade potentially making floors permanently icy.

* tweaks to gluon bomb as per bawhoppens request

* Update syndieminibomb.dm

* Update open.dm

* Update open.dm

* Update syndieminibomb.dm
2016-05-01 17:26:46 +10:00
Jordie
53fd10c54b Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake
Revert "Move some stuff from different layers to different planes"
2016-04-30 15:34:17 +10:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
duncathan salt
c3b91d6e86 fixes #17248 2016-04-29 13:32:35 -06:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205)
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
2016-04-29 20:29:20 +02:00
Remie Richards
ddb1dacb0c Merge pull request #17234 from tgstation/duncathan-patch-1
Fixes superconduction runtimes
2016-04-29 14:52:56 +01:00
duncathan salt
be3c64caeb Fixes superconduction runtimes 2016-04-29 02:48:52 -06:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
phil235
d5af5ca696 Objects with invisibility = 101 are ignored by procs like view() that are used for say() and visible_message().
Objects that are simply hidden (instead of being abstract things) now always use invisibility = 100.
This fixes not being able to hear what you say while inside a hidden gas/disposal pipe.
Fixes the t-ray scanner revealing abstract object that should never be seen, like spacevine controller.
Fixes not hearing anything during a mob transformation.
2016-04-29 00:04:40 +02:00
MrPerson
b50e0ee42c Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake 2016-04-27 17:03:32 -07:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235
b146131a34 Second commits.
This contains the changes to item_attack.dm
Obj/attackby() now follows a similar structure as mob/living/attackby. It calls attack_obj() (like attack() but for obj) which calls attacked_by (just like attack() does)
The use of the NOBLUDGEON flag changes a bit, it is now used to signify the item cannot be used as a melee weapon at all. No attack animation, no attack message. I've given this bitflag to many items that have an afterattack() so as to not both attack and do the special action (among those items: the rcd)

There's also the code changes to attacking machines: attacking any machine now give a proper message and a sound. And with this, I made more machines breakable (using a health var and the very little used BROKEN stat). Most notably, tables can now be attacked when on harm intent and be destroyed.

The newly destroyable machines have a take_damage() proc used by all sorts of attack (weapon, xeno, animal, hulk, mech melee, gun projectile, thrown items).

There's some more stuff in there, see the PR's description and comments.
2016-04-24 20:37:00 +02:00
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
MrPerson
3f70f880ac Move some stuff from different layers to different planes
Moves everything on a 15+ layer to a plane. So now you get screen catcher (-99, was already on a plane), lighting (15), effects that ignore lighting (16), fullscreen UI effects (18), screen objects used to build the UI (19), actual equipment in the UI slots (20), and everything else (0).

Also created a file to contain plane and layer defines for hopeful eventual use.

Hopefully this doesn't change anything now but does enable some nifty new features in the future.
2016-04-24 04:03:41 -07:00
KorPhaeron
b5dba745f5 Lava Engine 2016-04-20 23:08:41 -05:00
AnturK
de1740432a Merge pull request #16881 from nullbear/canister-attack-fix
Fixes stealthy attackby proc of portable air canisters
2016-04-17 13:04:02 +02:00
Cheridan
35f58039fe Merge pull request #16906 from Core0verload/operation-deruntimization
Fixes endless division by zero runtimes
2016-04-16 09:19:43 -05:00
c0
4419774792 Fixes endless division by zero runtimes 2016-04-16 11:18:44 +03:00
nullbear
582e1bf88c Fixes stealthy canister bashing. 2016-04-16 00:49:45 -07:00
Cheridan
6a2df04760 Merge pull request #16885 from tgstation/have-you-ever-realized-that-you-wrote-a-bunch-of-code-that-already-exists
makes parse_gas_string() use params2list()
2016-04-16 00:14:43 -05:00
duncathan salt
c46c5d3b54 makes parse_gas_string() use params2list() 2016-04-14 18:28:19 -06:00
nullbear
34e2dd7ae6 Raised maximum pressure output of air pumps. 2016-04-14 15:47:57 -07:00
Lularian
00ef4b7f32 makes cryo basically as good as showers 2016-04-12 02:35:23 -05:00
duncathan salt
e20b7caffe dumb 2016-04-11 08:37:16 -06:00
duncathan salt
aab7fdbde9 fix 2016-04-11 08:35:05 -06:00
Jordie
8c5a12aec5 Merge pull request #16797 from tgstation/509compatibilitywillbemaintaineduntil510isreleasedasastableversionofBYOND
improves parse_gas_string(); fixes 509 support
2016-04-11 16:11:21 +10:00