Commit Graph

8331 Commits

Author SHA1 Message Date
Markolie
c8db120dce Transit tube pressure fix 2014-12-22 20:31:03 +01:00
Markolie
934ca70d1d Locked message change 2014-12-22 19:49:16 +01:00
Markolie
04fab6fc9e R&D submenus, autolathe rework from /tg/ 2014-12-22 19:40:22 +01:00
Markolie
61fce70d9d Trash bags disposals fix 2014-12-22 17:53:47 +01:00
Markolie
1f87145c0b Empty RPED in disposals 2014-12-22 17:50:46 +01:00
Markolie
266b4cb113 R&D UI rework 2014-12-22 17:38:22 +01:00
Markolie
d78fa6d160 Separate R&D design files 2014-12-22 16:43:42 +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
Fox-McCloud
03c61ed3ab Foxes 2014-12-22 08:32:32 -05:00
Markolie
d440784473 Syndicat faction 2014-12-21 20:41:56 +01:00
Markolie
037f7e71b8 Talisman image 2014-12-21 16:38:23 +01:00
Markolie
3e7e6ef1e6 Fix startup runtime, remove debug from karma 2014-12-21 13:14:41 +01:00
Markolie
997a085399 Remove undead events, reduce chance of Greytide virus 2014-12-20 23:30:18 +01:00
Markolie
090c57819c Chemistry runtime fixes 2014-12-20 23:16:37 +01:00
Markolie
aa1aece2d4 Return --> continue 2014-12-20 22:55:43 +01:00
Markolie
640d5ef984 Another IPC radiation check 2014-12-20 20:55:38 +01:00
Markolie
17ae62bc99 Karma refund option, IPC radiation checks 2014-12-20 20:45:31 +01:00
Markolie
828158d9bd Forgot the karma file 2014-12-20 18:25:23 +01:00
Markolie
90cc925f78 Didn't quite work 2014-12-20 17:56:47 +01:00
Markolie
da8115dc2e Bug fixes 2014-12-20 16:27:33 +01:00
SamCroswell
774e43f985 Minor Depot Changes, Adds Stuff to Xenobotany Maint 2014-12-20 00:22:46 -05:00
Fox-McCloud
b68c0536cc Xenobotany 2014-12-19 05:07:36 -05: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
10ad4ad531 Mapfix, coroner description fix 2014-12-18 17:54: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
0d7f921960 Remove autopsy/detective scanner 2014-12-18 11:35:32 +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
Markolie
19fde1c4a0 Bug fixes 2014-12-17 21:56:37 +01:00
Fox-McCloud
337dc8e448 Odd 2014-12-17 08:17:27 -05:00
Fox-McCloud
4eff415d2f Detective Scanner 2014-12-17 08:10:03 -05:00
Fox-McCloud
84b9f05149 Xeno Tweaking 2014-12-16 20:26:27 -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
18cd40308d Alien notice fixes 2014-12-15 17:13:08 +01:00
Markolie
ad726006a3 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-15 12:05:10 +01:00
Markolie
e648bb959e Alien bugfixes 2014-12-15 12:04:30 +01:00
Fox-McCloud
8cec4742d0 Defib Unit 2014-12-15 04:55:02 -05:00
Fox-McCloud
91f456e1f1 Merge pull request #73 from SamCroswell/master
Weapons No Longer Embed, Minor Map Edits
2014-12-14 16:52:18 -05:00
SamCroswell
47a072742e Removes Snowmobiles, Fixes Ion Inhand 2014-12-14 16:46:42 -05:00
Fox-McCloud
78d161742e Healthdoll 2014-12-14 16:43:06 -05:00
SamCroswell
a82e3d95ee Weapons used at melee range no longer embed.
Melee weapons will no longer embed when hitting people directly with
them.

Note that items that are thrown and projectiles will still embed as per
their normal behavior.
2014-12-14 14:00:23 -05:00
Fox-McCloud
fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Markolie
1dda38f659 Larva fix 2014-12-14 03:33:45 +01: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