Commit Graph

650 Commits

Author SHA1 Message Date
Cheridan
55514c3be6 Merge pull request #17233 from coiax/mining-item-stats
Added more stat tracking to mining items and engine generation
2016-04-30 08:21:41 -05:00
AnturK
91fd7d4212 Merge pull request #17210 from Zuvassin/redoingbecausemergefailfml
Fixes issues with survival pod GPS and Fans not able to be deconstructed
2016-04-30 14:06:27 +02: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
Cheridan
34dd0e5b02 Merge pull request #17018 from KorPhaeron/megafauna
Megafauna
2016-04-29 20:27:21 -05:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
Razharas
81dadcec5f Merge pull request #17086 from MrPerson/planes_on_a_snake
Move some stuff from different layers to different planes
2016-04-29 15:51:41 +03:00
Jack Edge
fd8f0e425f Added statistics to mining and lavaland 2016-04-29 09:40:12 +01:00
Cheridan
fbd16c77cd Merge pull request #16934 from Core0verload/cargo
Changes to Stocks Console UI, cargo fixes
2016-04-28 23:22:17 -05:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
Zuvassin
1f0690ca02 Fixes issues with survival pod GPS and Fans not able to be deconstructed 2016-04-29 03:23:51 +10:00
Joan Lung
fd8942e70c Adds survival pod windows to the code
* Adds survival pod windows to the code

* Light and dark pod flooring

* looks better
2016-04-28 10:57:39 -06:00
KorPhaeron
ae989b2700 Death sound refactor, dragon fixes, dragon dead icons 2016-04-28 09:06:37 -05:00
KorPhaeron
f572ae0b88 Merge remote-tracking branch 'refs/remotes/tgstation/master' into megafauna 2016-04-28 04:21:09 -05:00
KorPhaeron
51452a2214 Dragon Loot 2016-04-28 04:11:42 -05:00
Joan Lung
cc59925d2e Merge pull request #17108 from Bawhoppen/sandbagsz
Some sandbag changes
2016-04-27 20:23:21 -04: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
bawhoppen
fa7158e860 fixed it 2016-04-27 04:35:59 -05:00
KorPhaeron
39c1af5792 Merge pull request #17147 from TechnoAlchemisto/skullhelm
Adds craftable skull helmet.
2016-04-26 23:56:34 -05:00
KorPhaeron
12d5a910b5 Merge pull request #17119 from TechnoAlchemisto/Mining_Harness
Adds explorer belt to mining vendor.
2016-04-26 20:06:48 -05:00
TechnoAlchemist
0a8da62457 adds primal category to stop clutter in cat_misc. 2016-04-26 16:34:54 -07:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
bawhoppen
deef852516 phil's suggestion 2016-04-26 05:06:01 -05:00
Zuvassin
dadae277cb Adds champion armour to necro chests 2016-04-26 18:55:31 +10:00
TechnoAlchemist
98030c8480 """"""""Design Lead""""""""""" 2016-04-25 16:51:09 -07:00
TechnoAlchemist
04eac2cbe6 adds explorer belt. 2016-04-25 15:59:02 -07:00
Lularian
322fc535ad sandbags rah rah rah 2016-04-25 05:04:11 -05:00
TechnoAlchemist
556f611278 makes the path /animalhide 2016-04-24 22:07:51 -07:00
TechnoAlchemist
581a13975b makes goliath plates stackable. 2016-04-24 21:27:48 -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
Razharas
ecd60dead3 Merge pull request #17053 from coiax/chasm-lifering
Jaunters can now be belt-worn to offer chasm protection
2016-04-24 22:09:26 +03: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
Jack Edge
c29f8478d7 Compiles now 2016-04-24 16:08:36 +01:00
Jack Edge
1f2c405763 Changes messages, based on feedback 2016-04-24 15:59:57 +01: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
Jack Edge
97b5e3918c Removed comments 2016-04-23 17:39:05 +01:00
Jack Edge
fe17fd395b Changed stabilizer name to stabilizing serum 2016-04-23 12:53:16 +01:00
Jack Edge
a304ec0e45 Regular jaunters now save you from chasms 2016-04-23 12:51:14 +01:00
Razharas
4999dee630 Merge pull request #17040 from ChangelingRain/tinyfan
Adds a tiny fan to the survival pod!!!
2016-04-23 02:29:01 +03:00
Jack Edge
880fb89ab4 Wormhole lifebuoy (chasm protection)
🆑 coiax
rscadd: As a sign of friendship between the Free Golems and Centcom,
they have developed the wormhole lifebuoy, a modified jaunter to be worn
around a user's waist, which will save them from falling to their death
in a chasm.
experiment: The lifebuoy's limited warranty does not cover exposure to
powerful electromagnetic fields.
tweak: Renamed hivelord stabilizer to legion's heart stabilizer.
/🆑
2016-04-22 11:37:14 +01:00
TechnoAlchemist
7b79508b17 bone ore and path REFACTOR. 2016-04-21 15:36:27 -07:00
Nerd Lord
476772f825 " 2016-04-21 17:58:02 -04:00
Nerd Lord
a6c39e474b Adds a tiny fan to the survival pod 2016-04-21 17:46:29 -04:00
Cheridan
6b144046de Merge pull request #16992 from ChangelingRain/reeland
Fixes occasional asteroid turfs on lavaland
2016-04-20 21:42:50 -05:00
Jack Edge
4446fd85f9 Flying mobs ignore chasms 2016-04-20 08:31:43 +01:00
Cheridan
044a3a1baa Merge pull request #16963 from KorPhaeron/capsule2
Only anchored dense objects block the shelter capsule
2016-04-20 00:42:43 -05:00
Joan Lung
5abc7f484a Merge pull request #16830 from KorPhaeron/BOATS
Adds lava boats
2016-04-19 20:48:25 -04:00
KorPhaeron
bd3c2647aa Added item state for oar 2016-04-19 19:34:45 -05:00
KorPhaeron
684a355f51 Boat Sprites 2016-04-19 19:31:02 -05:00