Commit Graph

8256 Commits

Author SHA1 Message Date
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
Fox-McCloud
1a1cc7137d Merge pull request #40 from SamCroswell/master
Coin Flipping! Also more map fixes.
2014-12-04 17:16:03 -05:00
SamCroswell
a1959291b7 Coin Flipping! Also more map fixes. 2014-12-04 17:12:41 -05:00
Fox-McCloud
31c6fc986e Merge pull request #38 from Markolie/master
Adds a "Toggle Sensors" verb to the robot/AI to set their HUD
2014-12-04 16:45:52 -05:00
Fox-McCloud
3cd97430df Merge pull request #39 from SamCroswell/master
Minor Map Fixes - New Costume Preset
2014-12-04 16:26:45 -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
Markolie
a1a80c1a27 Minor fixes 2014-12-04 18:18:01 +01:00
SamCroswell
32661552e9 You cannot use the force, Luke! 2014-12-03 21:48:42 -05:00
SamCroswell
021bc233be Dualsword Inhand Fix, Adds Dark Lord Costume Preset 2014-12-03 21:47:12 -05:00
Fox-McCloud
72ecf4ba5e Merge pull request #34 from Fox-McCloud/Production-Tweaks
Production tweaks
2014-12-03 18:52:09 -05:00
Fox-McCloud
c218c1af3b Production and Mecha Tweaks 2014-12-03 18:20:51 -05:00
Markolie
cb7676c139 Re-add stamp images, add more holopads 2014-12-03 02:53:26 +01: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
SamCroswell
b2dee687aa Head of Security Items Update
- HoS jacket can now be buttoned or unbuttoned with a verb.
- The HoS now only gets the jacket and hat he spawns with.
( I verified the HoS spawns with a jacket and hat no matter if they
latejoined or were HoS from the start of the shift)
2014-11-30 22:22:01 -05:00
Fox-McCloud
08dbeb7304 Merge pull request #17 from Markolie/master
Map fixes
2014-11-30 21:18:16 -05:00
Fox-McCloud
934550d268 Reagent Rebalance 2014-11-30 21:05:35 -05:00
Markolie
b8d361bedb Map fixes 2014-12-01 02:41:42 +01:00
Markolie
b820c1781d Make sure observers can read photos/paper bundles 2014-11-30 20:14:19 +01:00
Markolie
0bf46a71b1 Map changes, bug fixes 2014-11-30 20:10:34 +01:00
Fox-McCloud
4b2e3beb96 Weapon Changes 2014-11-30 08:18:29 -05:00
Fox-McCloud
43f3539b94 Merge pull request #11 from Fox-McCloud/Tech-Shells
Tech Shells
2014-11-30 06:44:57 -05:00
Fox-McCloud
805c638adf Tech Shells 2014-11-30 06:36:31 -05:00
Fox-McCloud
72b43c3c1e Merge pull request #8 from SamCroswell/master
Dress Up Fix
2014-11-30 00:23:18 -05:00
Fox-McCloud
abe86667ca Merge pull request #7 from Markolie/master
Fixes drone talk
2014-11-30 00:23:10 -05:00
Fox-McCloud
9a391827b6 Shotgun and Sprite Updates 2014-11-30 00:09:47 -05:00
SamCroswell
580dd00c1d Dress Up Fix 2014-11-29 23:22:59 -05:00
Markolie
8d93085560 Prevent AI from using spec ops shuttle 2014-11-30 04:10:07 +01:00
Markolie
74eb9424af Fixes drone talk 2014-11-30 03:57:39 +01:00
Markolie
ced6357e9b Fix basic energy gun runtime 2014-11-30 02:36:35 +01:00
Markolie
3de68526d4 Add autopsy data for stunning and bullets 2014-11-29 23:10:00 +01:00
Markolie
39eada12ba Move service channel to :z 2014-11-29 22:07:50 +01:00
Markolie
bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Markolie
412e087d7e NTSL addition for service 2014-11-29 21:01:20 +01:00
Markolie
0dc52900cc Adds the service channel (:v) 2014-11-29 21:01:19 +01:00
Fox-McCloud
f85def5f09 Hug Nerf 2014-11-29 10:09:57 -05:00
Fox-McCloud
3b884622c5 Job Changes 2014-11-29 09:10:31 -05:00
Markolie
35fa4600e7 Merge branch 'master' of https://github.com/Markolie/Paradise 2014-11-29 02:39:45 +01:00
Markolie
dbe0cbfad8 consistency 2014-11-29 02:10:32 +01:00
Markolie
ae8f08e2b8 Fixes reflection, various security level fixes, gamma armory update, communication console fixes 2014-11-29 02:05:42 +01:00
Fox-McCloud
0128878100 Merge pull request #535 from Fox-McCloud/Species-Guns
Species guns
2014-11-28 19:24:55 -05:00