Commit Graph

17074 Commits

Author SHA1 Message Date
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
Fox-McCloud
03c61ed3ab Foxes 2014-12-22 08:32:32 -05:00
Fox-McCloud
37aa0254fc Merge pull request #106 from Markolie/master
Bug fixes
2014-12-22 03:36:18 -05:00
Fox-McCloud
19e3da608b AI Satellite 2014-12-21 20:31:40 -05:00
Markolie
8a63f79e54 Sparks will now disappear properly 2014-12-22 00:15:58 +01:00
Markolie
d440784473 Syndicat faction 2014-12-21 20:41:56 +01:00
Markolie
61ffd5d9aa Whoops, fix canister path 2014-12-21 20:31:51 +01:00
Markolie
037f7e71b8 Talisman image 2014-12-21 16:38:23 +01:00
Markolie
dfe345cae0 Fix debug in security laptop 2014-12-21 15:17:07 +01:00
Markolie
56fd43a4bb Gamma armory name 2014-12-21 13:35:13 +01:00
Markolie
efe6f13f05 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-12-21 13:20:41 +01:00
Markolie
7ae17ec5bc And disable the SQL debug 2014-12-21 13:15:22 +01:00
Markolie
3e7e6ef1e6 Fix startup runtime, remove debug from karma 2014-12-21 13:14:41 +01:00
SamCroswell
31dbe4c9e5 Merge Conflict Fix? 2014-12-20 20:11:41 -05: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
138efdcec9 Xeno area 2014-12-20 23:10:24 +01:00
Markolie
aa1aece2d4 Return --> continue 2014-12-20 22:55:43 +01:00
Markolie
e5339b95f3 Buff telepathy, sanitize telepathy, stop aliens from opening canisters 2014-12-20 22:00:06 +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
0149ae94d6 Stop Karma meta'ing 2014-12-20 18:24:10 +01:00
SamCroswell
52a7313670 Minor Hand Tele Change, Depot Change
- The Hand tele's random mode will not not select turfs inside of an
area tagged to be immune to telescience. If there is a beacon there,
however, it can still be targeted with a large teleporter and then
relayed with the hand teleporter.

- The Syndicate depot is now surrounded by asteroid on almost every
side, and a large majority of the turrets on the outside have been
removed. There  have been two additional turrets added to the interior,
and there are now two exterior turrets at the end of the cave that leads
to the airlock. This is in response to player feedback, as they thought
that the turrets covering every angle of approach was detrimental due to
people who were floating by without knowing what was ahead were getting
shot and killed. This new design is still secure, but players will be
able to more easily go around the turrets if they do not wish to attempt
to break in.
2014-12-20 12:01:00 -05: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
FalseIncarnate
4f2fa1f293 Tigercat's Spacepod fix
Fixes some issues with 2 seater space pods. They should now correctly
clear the occupant var and accept dead/critical passengers as intended.
(Tiger did the work, I'm just posting it)
2014-12-19 23:05:53 -05:00
PJB3005
922c5a93e2 fixed 2014-12-19 12:11:03 +01: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
Fox-McCloud
817204dd95 Merge pull request #89 from Markolie/master
Bug fixes
2014-12-18 20:03:41 -05:00
Fox-McCloud
30276a9971 Merge pull request #94 from tigercat2000/master
Emergency Patch for two-seat Space-Pods. They are no longer infinity sized.
2014-12-18 19:35:16 -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
60867b7afb Proper power failure fix 2014-12-19 00:40:35 +01:00
Markolie
2c79a2f376 Bot fix, add emergency door access 2014-12-19 00:32:32 +01:00
Tigercat2000
46d2000d8b Emergency Patch for two-seat Space-Pods. They are no longer infinity
sized.
2014-12-18 14:28:47 -08: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
5df11b77c2 Remove power requirement from Gamma shuttle 2014-12-18 13:50:50 +01:00
PJB3005
67c1b34aae oops, I forgot a thing 2014-12-18 13:04:54 +01:00
PJB3005
25e6558f4f fine, have it your way, fox 2014-12-18 12:47:53 +01:00
Markolie
d639d87e98 Fix fat psych spawning naked, fur gloves can no longer be washed 2014-12-18 12:01:18 +01: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
Fox-McCloud
7e7433bb78 Merge pull request #80 from tigercat2000/master
Major spacepod overhaul. Allow's for two people per spacepod.
2014-12-17 23:34:56 -05:00