Commit Graph

674 Commits

Author SHA1 Message Date
Cheridan
ba3f4f4733 Merge pull request #17634 from KorPhaeron/austurfs2
Removes extra lines from austurfs
2016-05-14 15:10:55 -05:00
Joan Lung
8b656d2603 Merge pull request #17284 from MMMiracles/spookyjookie
Lavaland Ruins
2016-05-13 20:22:56 -04:00
KorPhaeron
4179cdeae9 Removes extra lines from austurfs 2016-05-13 10:56:25 -05:00
AnturK
d41be10210 Merge pull request #17605 from coiax/urgent-golem-jaunter-fix
[s] Golems target Free Golem ship when jaunting
2016-05-13 17:55:58 +02:00
Jack Edge
da8d8effb5 [s] Golems target Free Golem ship when jaunting 2016-05-12 11:00:46 +01:00
KorPhaeron
5f6ef4a383 Ausops Turfs 2016-05-12 03:15:43 -05:00
TechnoAlchemist
4705efa6da Adds new items to the mining vendors. (#17362)
* Adds new items to the mining vendors, also adds tracking implanter since that didn't exist before.

* woops

* Fixes tracking implants for miners, makes medipens not OD you on tricord.

* Actually doesn't OD on tricord now

* Chemical changes.

* Upgraded the jaunter into the wormhole lifebelt

🆑 coiax
rscadd: The Free Golems have developed the jaunter into the  wormhole
lifebelt, which automatically teleports the user when they fall in a
chasm or suffer a major medical emergency. Must be worn on the belt to work.
/🆑

Please don't mistake a random teleportation in crit for saving a user's
life, the Supply channel gets a notification, but suit sensors are
required to find them, and there's no guarantee the location picked is
safe (for example, the Toxins Test Site is a valid jaunt destination,
along with in the middle of the slime cages in Xenobiology).

* Adds modification kit.

* Golem ship now has its own /area

And a bluespace beacon.

* 5 tick medijaunt, no radio, golem jaunters + areas

The number of ticks before a medical emergency jaunt happens is now
five. No radio message is produced.

Free Golems now have no restrictions on what they can purchase. Wormhole
jaunters now specifically drop golems near their ship.

* Modkits remove the race restrictions from KAs.

* Buffs buffs buffs

I'd say something, but I'm sure I'd regret it later.

* Advanced lifebelts, golem superiority

* Removes modkit from minervendors, adds modkit to RnD!

* COMPILE DAMN YOU!!

* I made it compile

* Honor to my country, not to you :(

* fuck

* h-haha?

* Kor you know I would never actually ban you

* i could personally care less for HBls adminning style
2016-05-11 22:19:47 -05:00
Cheridan
2ba6208a64 Merge pull request #17414 from KorPhaeron/hackycodeforahackyplanet
Fixes bad atmos on lavaland
2016-05-09 23:13:31 -05:00
Cheridan
ee4d3785a3 Merge pull request #17484 from ChangelingRain/fixrobustinscode
Cleans up some cult code
2016-05-09 15:35:14 -05:00
bgobandit
28e99253c5 Alt-clicking abandoned crates no longer makes them explode. (#17433)
* Alt-clicking no longer explodes abandoned crates.

* humies only

* canusetopic to satisfy the kor
2016-05-09 15:00:14 -05:00
Razharas
0a3ddc886c Turns tablecrafting into personal crafting (#17341)
* Converts tablecrafting to datums

* Adds crafting.dm

Adds crafting.dm

* Fix merge conflicts

Fix merge conflicts

* Fixes dme

* Fixes returns

Fixes returns

* Only check hands and remove old paths

Only check hands and remove old paths

* Recipe fixes

Recipe fixes

* Removed action button

Removed action button
Added small ui button to inventory near the intent wheel
Removed debug
href_list is not longer /list

* Added adjucent checks

Added adjucent checks

* Snacks now get chems from parts

Snacks now get chems from parts

* Complex food fuckery fixed

Complex food fuckery fixed

* Fixes old recipe

Fixes old recipe

* Fix to infinite loops in reagent extraction

Fix to infinite loops in reagent extraction
It was finding old empty containers and tries to extract from them

* Fixes hands not checking

Fixes hands not checking

* Fixes reagents fucking up

Fixes reagents fucking up

* Even more reagent fuck ups fixed and comments

Even more reagent fuck ups fixed and comments

* Fixes all the shit i could find

Fixes all the shit i could find

* Removes debug and mechs

Removes debug and mechs

* Argument renaming

Argument renaming

* Fixes all argument names

Fixes all argument names

* Final fix of arguments

Final fix of arguments
2016-05-09 18:14:48 +02:00
KorPhaeron
8c2b0089a2 Adds afterchange to turfs 2016-05-09 00:20:19 -05:00
MMMiracles
eb58b393cc conflicts + ruin system 2016-05-08 19:54:57 -04:00
Nerd Lord
4e2cefaddf Merge branch 'master' of https://github.com/tgstation/-tg-station into fixrobustinscode
Conflicts:
	icons/mob/mob.dmi
2016-05-08 14:33:54 -04:00
Nerd Lord
ff984ec0cc cleanup 2016-05-08 11:46:26 -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
MMMiracles
923aa61501 when u forget to pull for updates before touching a .dmi 2016-05-07 01:35:22 -04:00
Joan Lung
47be3fb9d1 Merge pull request #17375 from KorPhaeron/bottle
Ship in a bottle
2016-05-06 19:58:17 -04:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
KorPhaeron
f755dc6f31 Fixes loot path 2016-05-05 06:02:21 -05:00
KorPhaeron
e9965254b4 Fixes for the ship in a bottle 2016-05-05 05:30:54 -05:00
KorPhaeron
86f9408bc5 Fixes bad atmos on lavaland 2016-05-05 05:20:10 -05:00
KorPhaeron
343b32837e Ship in a bottle 2016-05-04 02:59:17 -05:00
MMMiracles
b967ae25c6 spooky pod 2016-04-30 11:07:00 -04:00
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