Commit Graph

9304 Commits

Author SHA1 Message Date
Markolie
da8115dc2e Bug fixes 2014-12-20 16:27:33 +01: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
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
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
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
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
Tigercat2000
aeb4841f01 Minor change; You can load corpses into the space-pod, but not living
people.
2014-12-17 20:22:55 -08:00
Tigercat2000
da9f1ed079 Fox's suggested changes- Includes ability to lock pod from new entries,
But not the occupant. The secondary occupant can still get out by
will. Entering a pod with the nuke disk is now impossible. Cannot drag
people into pods; This means you can go on adventures with your buddy,
but, no shoving people into pods and ejecting them into space.
2014-12-17 20:15:03 -08:00
Markolie
19fde1c4a0 Bug fixes 2014-12-17 21:56:37 +01: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
Fox-McCloud
cd156062e8 Ooops 2014-12-15 20:12:51 -05:00
Fox-McCloud
871666156b Icon Fixes 2014-12-15 19:05:13 -05:00
Markolie
8c6339d853 Fix CentCom dock 2014-12-15 21:30:13 +01:00
Markolie
3d595fc612 AI ending message fix 2014-12-15 20:48:24 +01:00
Tigercat2000
e2082e266e Major spacepod overhaul. Allow's for two people per spacepod. Makes
prisoner transport viable via click-drag and new 'lock secondary door'
option.
2014-12-15 06:56:06 -08:00
Markolie
24c9581faf Map changes 2014-12-15 13:24:07 +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
b9dc61b225 forgot this 2014-12-15 05:18:24 -05:00
Fox-McCloud
8cec4742d0 Defib Unit 2014-12-15 04:55:02 -05: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
DZD
8f92593e4a Fixed pAI Death and Interface While in Drone Form
- pAI interface now closes when a user tries to interact with it while
the pAI is in drone form or out of range.
- PROPERLY fixed drone pAI death, leaves a corpse on the ground.
2014-12-14 15:31:30 -05:00
Fox-McCloud
fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Markolie
cd7f08cf31 More changes 2014-12-14 02:54:08 +01:00
Markolie
b803482b52 More access changes 2014-12-14 02:38:25 +01:00
Markolie
a70c06b7b7 Welding closet 2014-12-14 02:10:12 +01:00
Markolie
4c43e7b573 HoS 2014-12-14 02:01:09 +01:00
Markolie
303d7dbf47 Access fixes 2014-12-14 02:00:18 +01:00
Markolie
b4db3ca710 Inflatable wall box change 2014-12-14 01:02:51 +01:00
Markolie
38e709e4bd Telescience crystal revert, supervisor access/PDA/headset fixes 2014-12-14 00:46:46 +01:00
Markolie
8f50ed68ca Wording change 2014-12-13 22:31:54 +01:00
Markolie
22eb3e3c29 Bug fixes 2014-12-13 21:53:01 +01:00
Markolie
320f4ee151 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-13 18:59:25 +01:00
Markolie
6d3f0e8bf4 Bug fixes 2014-12-13 18:59:04 +01:00
Fox-McCloud
8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00