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
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
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
Markolie
c7acac268a
Map fixes, hydroponics wrenching fix, adds satchel to scientist's locker
2014-11-30 22:03:44 +01:00
Tigercat2000
d70ca5acb2
Fix's the handcuffing logs to be Officer > Cuff-ee instead of Cuff-ee >
...
Officer
2014-11-30 12:54:09 -08: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
9a391827b6
Shotgun and Sprite Updates
2014-11-30 00:09:47 -05:00
Tigercat2000
34d4bb0da4
Whoops, Left in some unfinished code, removed
2014-11-29 17:18:00 -08:00
Tigercat2000
28bff4161e
Makes unable to scan message red instead of blue
2014-11-29 16:57:12 -08:00
Tigercat2000
7512adf2f5
Fixes a potentially abusable bug involving the chameleon projector and
...
playing cards.
2014-11-29 16:54:49 -08: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
0dc52900cc
Adds the service channel (:v)
2014-11-29 21:01:19 +01: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
