Commit Graph

3054 Commits

Author SHA1 Message Date
Fox-McCloud 05f19808a5 Merge pull request #161 from Markolie/master
Simplify and cleanup IPC/defib revival after messy fixes
2015-01-13 14:00:20 -05:00
Markolie bde14e78b3 Atmos console emag fix 2015-01-13 18:51:41 +01:00
Bone-White f8302889d4 Merge pull request #1 from ParadiseSS13/master
Downstream merge
2015-01-11 17:36:57 +00:00
Bone White ec8f90efd9 Air Alarms now deconstructable
They also update to the correct area when constructed, and the runtime
errors (which I'm assuming were why deconstructing them was disabled)
have been fixed.
2015-01-11 11:18:58 +00:00
Markolie 042ac20d5e Remaining 3 /tg/ away missions 2015-01-11 07:41:12 +01:00
Markolie ced499edc3 Vox Heist port from Bay 2015-01-10 06:21:21 +01:00
Markolie 6ce5b379e4 Let AI transmit cryo/arrival messages when present, let AI change arrival message 2015-01-06 02:06:23 +01:00
Markolie 91cd9eb0b0 Supply display fix 2015-01-05 21:25:47 +01:00
Markolie 92b57b5189 Bug fixes, R&D design files, map fixes 2015-01-05 21:03:48 +01:00
Fox-McCloud a92921786f Clothing Update 2015-01-01 11:23:48 -05:00
Fox-McCloud 525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Fox-McCloud ff186408ed Malf AI update 2014-12-24 21:23:04 -05:00
Markolie 4b0b4af281 Plasma 2014-12-24 20:06:48 +01:00
Markolie f03bbf8bc6 Bug fixes 2014-12-24 12:53:49 +01:00
Markolie 04fab6fc9e R&D submenus, autolathe rework from /tg/ 2014-12-22 19:40:22 +01:00
Markolie 266b4cb113 R&D UI rework 2014-12-22 17:38:22 +01:00
Markolie 579acd75e3 Ports over NanoUI camera console map from Baystation12 2014-12-22 16:01:38 +01:00
Markolie 71a9a358e1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-12-22 15:14:35 +01:00
Markolie 47f4161fbb Bug fixes, map fixes 2014-12-22 14:47:58 +01:00
Markolie 61ffd5d9aa Whoops, fix canister path 2014-12-21 20:31:51 +01:00
Markolie e5339b95f3 Buff telepathy, sanitize telepathy, stop aliens from opening canisters 2014-12-20 22:00:06 +01:00
Markolie da8115dc2e Bug fixes 2014-12-20 16:27:33 +01:00
SamCroswell 691991e444 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
r infinity"

This reverts commit 46d2000d8b.

Conflicts:
	maps/cyberiad.dmm
2014-12-18 21:09:43 -05:00
SamCroswell f0801b2416 Syndicate Depot, Turret Fixes, Telesci Proofing
- Adds the Syndicate depot, an outpost heavily guarded by turrets, and
proofed against telescience.

- Fixes gun_turrets not ID'ing syndicate agents properly, adds support
for different bullets.

- Adds support to make an area un-accessible to telescience. I wish
there was a better way to handle that in the telescience computer, but
noone I consulted could seem to figure a way out. Simply set the area
tag in question's tele_proof to 1 to disable telescience in that area.
2014-12-18 19:16:07 -05:00
Markolie 2c79a2f376 Bot fix, add emergency door access 2014-12-19 00:32:32 +01:00
Markolie 50a176571a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-12-18 17:13:18 +01:00
Fox-McCloud 53d15682ce Melee Rebalancing 2014-12-18 10:22:02 -05:00
Markolie d639d87e98 Fix fat psych spawning naked, fur gloves can no longer be washed 2014-12-18 12:01:18 +01:00
Fox-McCloud 5d416041c2 Merge pull request #92 from FalseIncarnate/master
Assorted Fixes / Changes
2014-12-18 03:20:13 -05:00
FalseIncarnate 8a5a9b0242 Assorted Fixes / Changes
Hydroponics trays can now be sprayed with any spray container (Space
Cleaner bottles, Chemsprayers, Plant-B-Gone bottles, etc) and will
correctly transfer the actual reagents to the tray and remove them from
the container.

Repairing robotic limbs with a welder will no longer cause eye damage.
This will allow medical to repair IPCs and prosthetic limbs again
without needing a welding mask/goggles. May also extend to fixing up
borgs with a welder too. The sounds and other recent IPC changes are
unaffected.

Anyone injected with Slime Toxin, the special reagent from Green Slime
Extract, will now receive some messages explaining their new form.
Should hopefully avoid confusion regarding Shadow People and the
previously unexplained damage they were receiving. At this time, the
dark sight for Shadow People is likely still not functioning properly,
and will hopefully be improved in the near future.
2014-12-18 03:14:56 -05:00
Fox-McCloud fff011e334 Merge pull request #84 from SamCroswell/master
Buzzsky Icon, Pingsky Hates Humans
2014-12-16 10:24:19 -05:00
SamCroswell 56f22dbf2d Buzzsky Icon, Pingsky Hates Humans
Buzzsky now gets an icon that reflects his sorry state, Pingsky now has
anti-human sentiment.
2014-12-15 20:25:00 -05:00
Markolie e648bb959e Alien bugfixes 2014-12-15 12:04:30 +01:00
SamCroswell 6531eda5f9 SecBot Harmbaton Support
God rest my soul for coding this, but I've added support for secbots to
harmbaton people.

Currently there is no way outside of adminboos to set the var, and the
only secbot who has it set to true is the ever-spiteful Officer Buzzsky.
I might do something with emagged secbots and this in the future, but I
wanna discuss that with a few people prior to implementing it.
2014-12-14 23:50:29 -05:00
SamCroswell 6df3648c6f Adds Officer Buzzsky!
Officer Buzzsky, somehow stuck in the atmos mix tank, has a less than
favorable outlook on the crew due to the telescientists and engineers
being too lazy to rescue him. Good thing he can't get out, or he might
hurt someone!
2014-12-14 22:52:51 -05:00
Fox-McCloud fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Markolie 303d7dbf47 Access fixes 2014-12-14 02:00:18 +01:00
Markolie 38e709e4bd Telescience crystal revert, supervisor access/PDA/headset fixes 2014-12-14 00:46:46 +01:00
Markolie 22eb3e3c29 Bug fixes 2014-12-13 21:53:01 +01:00
Fox-McCloud 8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00
Markolie e31886016b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/objects/structures/window.dm
2014-12-13 02:15:05 +01:00
Markolie 37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Fox-McCloud 1b4cd99491 Merge pull request #64 from Fox-McCloud/Stamina
Stamina
2014-12-12 08:19:39 -05:00
Fox-McCloud e76c8f26f3 Stamina 2014-12-12 06:52:20 -05:00
Markolie c55c74207d Telescience port from /tg/ 2014-12-11 17:10:40 +01:00
Markolie 46a061e722 Bug fixes 2014-12-11 15:20:45 +01:00
Markolie 7359061678 Bug fixes 2014-12-10 04:47:24 +01:00
Fox-McCloud 4868d3795d Vox and Space 2014-12-09 03:47:46 -05:00
Fox-McCloud cd6814e380 Merge pull request #48 from Markolie/master
Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes
2014-12-06 22:59:38 -05:00
Markolie b8a440f23a Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes 2014-12-07 04:55:48 +01:00