Commit Graph

3669 Commits

Author SHA1 Message Date
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
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 84b9f05149 Xeno Tweaking 2014-12-16 20:26:27 -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 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
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 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 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
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 b8282b7cae Blueshield/NT Rep/NT Rec updates 2014-12-10 06:09:06 +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
Fox-McCloud d0140aefe3 Merge pull request #30 from TheDZD/pAI-Drone-Port
Bay pAI Drone Form Port [Ready to Merge]
2014-12-06 17:48:59 -05:00
DZD b951d5a8f8 IT WOOOOOOOOORKS
- Fixed pAI master interface.
- Removed debug code and redundant and unused proc.
2014-12-06 16:19:47 -05:00
DZD 0c75432620 Merge remote-tracking branch 'upstream/master' 2014-12-06 13:09:13 -05:00
SamCroswell 5738c94650 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-12-06 11:54:12 -05:00
SamCroswell d23578525d NeinHaus' warning stripe icons
Adds NeinHaus' warning stripe icons as a child of the warning stripe
object, when mapping, if at all possible, please use these instead of
the turfs that come with them already on it, as these will merge with
the turf at runtime, and are more flexible.
2014-12-06 11:49:58 -05:00
SamCroswell 07435d52d1 Revert "NeinHaus' warning stripe icons"
This reverts commit a6a1ac9dc4.
2014-12-06 11:49:45 -05:00
SamCroswell a6a1ac9dc4 NeinHaus' warning stripe icons
Adds NeinHaus' warning stripe icons as a child of the warning stripe
object, when mapping, if at all possible, please use these instead of
the turfs that come with them already on it, as these will merge with
the turf at runtime, and are more flexible.
2014-12-06 11:48:20 -05:00
Fox-McCloud ce94dbe5e9 Merge pull request #43 from Markolie/master
HUD fixes, Vox naming change, Beepsky ID fix, IPC fixes
2014-12-06 03:04:27 -05:00
Fox-McCloud 21a1c0bc83 Stunning Changes 2014-12-06 02:33:31 -05:00
Markolie 86f80d5a69 IPC fixes galore 2014-12-06 08:28:02 +01:00
DZD 908058c8f0 Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port 2014-12-05 20:32:40 -05:00
Fox-McCloud 278581e14a Merge pull request #42 from SamCroswell/master
Map + Bug Fixes
2014-12-05 19:10:23 -05:00
SamCroswell 2d1f82f94e VERY Minor Map Fixes, Bug Fixes
The plating in the maintenance bar now has the correct icon when given
tiles.

Borgs can no longer add their modules to carts.

The hand teleporter now recharges properly again.
2014-12-05 19:08:36 -05:00
Fox-McCloud fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
Markolie a1a80c1a27 Minor fixes 2014-12-04 18:18:01 +01:00
Fox-McCloud 673ba85ca8 Merge pull request #35 from SamCroswell/master
Dance Bar Update
2014-12-03 19:49:28 -05:00
SamCroswell 7a3f19d00f Area Tag Fix, Bar Is No Longer Space
The bar is no longer exposed to space via a tile under the booze-o-mat,
fix the area to be unpowered by default.
2014-12-03 19:41:33 -05:00
Fox-McCloud 72ecf4ba5e Merge pull request #34 from Fox-McCloud/Production-Tweaks
Production tweaks
2014-12-03 18:52:09 -05:00