Commit Graph

187 Commits

Author SHA1 Message Date
Kyep
4427d02acd researchnotes, pills, injector runtime 2018-12-09 00:41:11 -08:00
variableundefined
24ace06513 Merge pull request #10324 from granodd/ReagentScannerUpgrade
The Old Mass Spectrometer is Dead, Long Live the Reagent Scanner
2018-11-25 08:38:29 +08:00
Granodd
4b0cef8fb6 Fixes map conflicts. 2018-11-23 20:10:06 -05:00
TDSSS
96ae2f1696 Added hardsuit helmets and correct telecom components 2018-11-22 22:38:34 +01:00
variableundefined
9baf91fdfe Add baycard to map, loadout & datum. Replacing normal non-syndicate cards with them. 2018-10-31 17:12:43 +08:00
variableundefined
9dbd3445ab Merge pull request #9821 from SamHPurp/grime/dirt-away
Away Missions dirt grime and decals
2018-10-12 13:55:40 +08:00
Purpose
86811c8bae Away mission grime / dirt / decals 2018-10-12 00:05:48 +01:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
2018-10-09 10:06:03 +08:00
variableundefined
e5e13adeb1 Merge pull request #9759 from SamHPurp/space-hotel-decals
Updates Decals on Space Hotel Away Mission
2018-10-08 12:16:05 +08:00
variableundefined
4279b4efa1 Merge pull request #9761 from SamHPurp/terror-spiders-decals
Updates Decals on Terror Spiders Away Mission
2018-10-08 12:15:32 +08:00
variableundefined
92e781c3c3 Merge pull request #9764 from SamHPurp/space-battle-again
Revert "Revert "Fixes Corpse Spawners & Adds Decal handling to Space Battle Away Mission""
2018-10-08 10:15:30 +08:00
Purpose
0d7baab91d round two 2018-10-08 02:07:10 +01:00
Purpose
ed54a57baa terror spider decals 2018-10-08 01:55:22 +01:00
tigercat2000
be798623b4 Revert "Fixes Corpse Spawners & Adds Decal handling to Space Battle Away Mission" 2018-10-07 17:45:24 -07:00
variableundefined
d9be23e035 Merge pull request #9758 from SamHPurp/updates-spacebattle
Fixes Corpse Spawners & Adds Decal handling to Space Battle Away Mission
2018-10-08 08:41:34 +08:00
variableundefined
b342d01f7a Merge pull request #9756 from SamHPurp/moonoutpost19-decals
Updates Decals on MoonOutpost19 Away Mission
2018-10-08 08:36:07 +08:00
Purpose
de9fd5dd57 space hotel decals 2018-10-08 01:35:01 +01:00
Purpose
68eec9a5b6 updates space battle 2018-10-08 01:20:14 +01:00
variableundefined
2a397c8b01 Merge pull request #9733 from SamHPurp/blackmarketbackpackers-decals
Updates Decals on Blackmarket Backpackers
2018-10-08 07:57:56 +08:00
variableundefined
d21ed493d2 Merge pull request #9755 from SamHPurp/evil_santa-decals
Updates Decals on Evil Santa Away Mission
2018-10-08 07:54:11 +08:00
Purpose
9a3eb571c0 moon outpost 19 decals 2018-10-08 00:47:22 +01:00
Purpose
5aa923d6af evil santa decals 2018-10-08 00:28:24 +01:00
Purpose
f9e76e198d decals 2018-10-08 00:24:12 +01:00
Purpose
56d3d117f8 decals 2018-10-07 17:10:52 +01:00
Purpose
0bdf4408ce a few more /item/.... 2018-10-06 16:42:05 +01:00
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Aurorablade
ce3ecee145 Port of TG ghost role spawner and Corpse Landmark refactor (#8211)
Port of TG ghost role spawner and Corpse Landmark refactor
2018-10-03 11:31:55 +08:00
variableundefined
06b2706de4 Merge pull request #9653 from SamHPurp/academy-fixes
Fixes mapping inconsistencies & updates Academy.dmm to using decals
2018-10-01 21:39:14 +08:00
Purpose
970d56b96c adds turf damage/scorch landmarks 2018-09-30 23:13:01 +01:00
Purpose
93e45f71a6 fixes mapping inconsistencies & updates Academy.dmm to using decals 2018-09-30 18:01:17 +01:00
Purpose
efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
Kyep
705801649e Del 2 awaystart, add 1 awaystart 2018-09-06 00:52:44 -07:00
Kyep
2c0a779b62 Fixes area/shutter error 2018-09-01 19:05:42 -07:00
variableundefined
2ec4485b2d Fixes bad path runtime 2018-08-19 12:10:33 +08:00
Crazy Lemon
1c516292ef Merge pull request #8900 from Kyep/ts_map_fix
Terror Spider away mission pipes & vents
2018-06-05 11:39:06 -07:00
Fox McCloud
7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk
# Conflicts:
#	code/game/objects/structures/window.dm
2018-06-03 18:49:44 -04:00
uraniummeltdown
75bded82cf added defines for window construction states and full window diagonal dir
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
2018-06-03 13:11:37 +04:00
Kyep
b48a2b5ee6 Merge remote-tracking branch 'ParadiseSS13/master' into ts_map_fix 2018-05-27 15:36:19 -07:00
Kyep
a72902a2fa light tweak 2018-05-27 14:23:49 -07:00
Fox McCloud
1cbf0821a1 awayyyy missionsssss 2018-05-19 19:18:44 -04:00
Fox McCloud
5109c02895 disdainnnnn 2018-05-04 17:02:22 -04:00
Kyep
a5ecc0694c queen vents, lights 2018-05-03 21:27:35 -07:00
Fox McCloud
b394cf3624 Ports Holoprojectors 2018-04-30 00:24:46 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
9f36a119a9 Makes All Maps Compile 2018-04-25 15:10:50 -04:00
FalseIncarnate
a402099231 Fixes bad paths on wildwest.dmm
Fixes bad paths on wildwest.dmm caused by #8901 which were not caught
due to being merged before being run through TRAVIS again.

Changes are map-merged.
2018-04-24 23:41:48 -04:00
Fox McCloud
7ee1221683 robotic fabricator 2018-04-23 22:25:53 -04:00
Kyep
9f75f8dcf4 insignificant change to force map diff update 2018-04-22 01:12:23 -07:00
Kyep
033e83718a Fixes pipenet 2018-04-20 21:17:04 -07:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00