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
Markolie
19d6bf8cc4
Armalis armour fix, remove backup from git
2014-12-13 22:03:38 +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
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
e657ee93a8
Merge pull request #66 from TheDZD/Slime-People
...
Properly Removes Slime Person Ventcrawl
2014-12-12 17:46:32 -05:00
Fox-McCloud
fb14d3831e
Movement Speed Refactor
2014-12-12 10:17:53 -05: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
Fox-McCloud
e7d57174c0
Merge pull request #63 from Markolie/master
...
Bug fixes, /tg/ telescience port
2014-12-12 03:41:03 -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
DZD
8e1d0855df
Properly Removes Slime Person Ventcrawl
...
Commit #535 on https://github.com/ZomgPonies/Paradise had not properly
removed the addition of the ventcrawl verb to Slime People, this is
fixed.
2014-12-10 21:45:05 -05:00
Fox-McCloud
066d5bb991
Merge pull request #57 from Markolie/master
...
Bug fixes
2014-12-10 00:31:12 -05: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
c1921ad150
PAI Changes
2014-12-09 22:45:05 -05:00
Fox-McCloud
1aff490e42
Magboots Fix
2014-12-09 22:11:18 -05:00
Fox-McCloud
4868d3795d
Vox and Space
2014-12-09 03:47:46 -05:00
Fox-McCloud
8b59fc7cf1
Merge pull request #51 from Markolie/master
...
Advanced Health HUD fix
2014-12-07 23:44:51 -05:00
Markolie
766831f1ff
Advanced Health HUD fix
2014-12-08 02:26:13 +01: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
DZD
0c75432620
Merge remote-tracking branch 'upstream/master'
2014-12-06 13:09:13 -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
