DZD
0c75432620
Merge remote-tracking branch 'upstream/master'
2014-12-06 13:09:13 -05:00
Fox-McCloud
fec371226d
Merge pull request #44 from TheDZD/spacepod
...
Space Pod Weapon Fix and Misc. Changes
2014-12-06 03:05:04 -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
DZD
e96f7799bb
Fixes Space Pod Health
...
Civilian space pod has 100 health instead of 200.
2014-12-05 20:22:25 -05:00
DZD
90bbdcac2c
Space Pod Weapons Fix and Minor Changes
...
- [x]Space pods will now fire their weapons properly.
- [x]Space pods now have less health (150 for regular pods, 200 for
security)
- [x]Space pods now have a light that can be toggled on/off.
- [x]Security pod now has a regular taser rather than a burst taser by
default
- [x]Adjusted fire rates and energy costs for space pod weapons
- [x]Tasers can fire every 2 seconds at a 250 energy cost.
- [x]Lasers can fire every 3 seconds at a 300 energy cost.
- [x]Burst tasers can fire every 4 seconds at a 350 energy cost.
2014-12-05 20:21:11 -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
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
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
d0e9752931
AI HUD color update, add icon for sensors
2014-12-04 22:20:32 +01:00
Markolie
bd97e02524
Make sure securitrons report to the AI
2014-12-04 22:03:20 +01: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
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
SamCroswell
f1b5476a85
Dance Bar Update
2014-12-03 19:18:00 -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
10e8d20134
Actually unlock the vault to access the nuke during Blob critical mass
2014-12-03 06:07:25 +01:00
Markolie
0f42e96159
Adds some additional photocopiers
2014-12-03 03:03:02 +01: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
91d6cda932
Remove luminosity from entertainment monitors
2014-12-02 22:49:14 +01:00
Markolie
47bb8c63bb
Syndibot critical fix
2014-12-02 22:40:39 +01: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
Fox-McCloud
79125ffb37
Merge pull request #28 from Fox-McCloud/Sprite-Updates
...
Sprite Updates
2014-12-02 09:04:09 -05:00
Fox-McCloud
67f8c7a79a
Sprite Updates
2014-12-02 08:49:44 -05:00
Fox-McCloud
2957d22caf
Merge pull request #25 from SamCroswell/master
...
Minor Security Update
2014-12-01 21:36:46 -05:00
SamCroswell
55e55e7c91
Minor Security Update
...
- Fixes seclite inhand, updates to the newer seclite icon.
- Corporate security outfits now spawn with the rest of the security
wardrobe.
2014-12-01 21:15:27 -05:00
Fox-McCloud
90ea1728a0
Merge pull request #24 from Markolie/master
...
Re-add missing Telecomms service server, other fixes
2014-12-01 18:18:49 -05:00
Markolie
7e98ba2abe
Poster ripping fix, allow access to air alarms when set to auto
2014-12-01 23:11:10 +01:00
Fox-McCloud
3e321cf360
Merge pull request #20 from SamCroswell/master
...
Head of Security Items Update
2014-12-01 06:28:18 -05:00
Fox-McCloud
0adf73421f
Merge pull request #21 from nicky89107/master
...
Fixes the telebaton logging to be the correct way around. Slightly modifies muzzle sprite to not look like it is eating faces.
2014-12-01 06:27:25 -05:00
Tigercat2000
770c2ca8e6
Fixes the telebaton logging to be the correct way around.
2014-11-30 20:20:14 -08: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
0c2ac9b565
Merge pull request #19 from Fox-McCloud/False-Wall-Smoothing
...
False Wall Fixes
2014-11-30 21:46:59 -05:00
Fox-McCloud
e082c441f0
False Wall Fixes
2014-11-30 21:45:37 -05:00
Fox-McCloud
6ba65ed1c7
Merge pull request #10 from nicky89107/master
...
Fixes handcuff log. All other commits have been reverted.
2014-11-30 21:18:55 -05:00
DZD