Commit Graph

4242 Commits

Author SHA1 Message Date
Markolie
da8115dc2e Bug fixes 2014-12-20 16:27:33 +01:00
Markolie
2c79a2f376 Bot fix, add emergency door access 2014-12-19 00:32: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
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
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
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
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
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
c1921ad150 PAI Changes 2014-12-09 22:45:05 -05:00
Fox-McCloud
4868d3795d Vox and Space 2014-12-09 03:47:46 -05: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
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
Markolie
6c92a48c41 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-06 01:31:31 +01:00
Markolie
aa68b2e160 AI/Cyborg HUD fixes, lets Vox's pick name when spawning, fixes Beepsky's/ED-209's ID'ing issue 2014-12-06 01:26:59 +01:00
Fox-McCloud
fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
Markolie
5b91100303 Adds a "Toggle Sensors" verb to the robot/AI to set their HUD 2014-12-04 22:01:05 +01:00
Fox-McCloud
c218c1af3b Production and Mecha Tweaks 2014-12-03 18:20:51 -05:00
DZD
dd631d4806 Migrating Bay pAI Drone Form Port 2014-12-02 18:00:24 -05:00
Markolie
01ed97b4eb Bot fixes, disease runtime fix, vending menu fix 2014-12-02 19:46:34 +01:00
Markolie
dab516174b Gives the AI control over bots 2014-12-02 17:59:40 +01:00
Markolie
b21575f088 Bot port from /tg/ 2014-12-02 17:59:40 +01:00
Markolie
b8d361bedb Map fixes 2014-12-01 02:41:42 +01:00
Markolie
0bf46a71b1 Map changes, bug fixes 2014-11-30 20:10:34 +01:00
Markolie
74eb9424af Fixes drone talk 2014-11-30 03:57:39 +01:00