Arokha Sieyes
452ee7e80f
Prevent ranged vore
...
:[
2017-03-21 21:01:18 -04:00
Arokha Sieyes
185f920f70
Update name spelling of heph
2017-03-21 11:32:36 -04:00
Arokha Sieyes
be9bcf81f0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-03-21 11:22:29 -04:00
Arokha Sieyes
b19b119405
Merge pull request #1222 from VOREStation/aro-aistuff
...
AI Upgrades
2017-03-21 11:16:33 -04:00
Arokha Sieyes
efbcc6b56e
Merge pull request #1223 from VOREStation/aro-spawntweak
...
Makes the 'Spawn Character' verb include custom items
2017-03-21 11:15:03 -04:00
Arokha Sieyes
25a84af366
Makes the 'Spawn Character' verb include custom items
...
Only really works if you pick the option to put them in the mob, because the proc that spawns custom items is based on that, and I don't really want to rework the custom items system for such a small fix.
2017-03-21 09:44:02 -04:00
Arokha Sieyes
60791e3645
VOREStation Portion of AI Upgrade
2017-03-21 03:02:31 -04:00
Arokha Sieyes
5ddf8c8185
Polaris Portion of AI Upgrade
2017-03-21 03:02:15 -04:00
Arokha Sieyes
539d52ede1
Compound icon generator proc
...
Why didn't this exist before? Am I missing something? I need manipulatable icons of existing atoms including their overlays. Is there some easier way to get them than this...?
2017-03-21 02:30:03 -04:00
Neerti
7d1245d180
Merge pull request #3113 from Anewbe/easy_communicators
...
Communicator QoL
2017-03-21 02:17:27 -04:00
Anewbe
c65588b099
Communicator QoL
2017-03-21 00:51:26 -05:00
Anewbe
f796914849
Fixes a thing with jetpacks
2017-03-21 00:27:31 -05:00
Neerti
7f14550a9a
Merge pull request #3010 from Anewbe/cargo_heph
...
Readds HI prosthetics, corrects naming
2017-03-21 00:27:00 -04:00
Anewbe
9559b6e7cc
Merge pull request #3111 from Leshana/singulo-fixes
...
Fix signularity_pull leaving ghost item in your inventory slot
2017-03-20 22:33:43 -05:00
Anewbe
04c4b14e4b
Merge pull request #3110 from Leshana/jukebox-wires
...
Make jukebox controllable by its wires
2017-03-20 20:38:56 -05:00
Leshana
3a4bc3d897
Fix signularity_pull leaving ghost item in your inventory slot
...
* It called u_equip() Nothing should call u_equip(), bad!
* Also replaced magic numbers with defined constants while I was checking singularity code.
2017-03-20 21:31:52 -04:00
Anewbe
4779baf872
Spelling
2017-03-20 20:14:48 -05:00
Anewbe
beaadfa4cc
Merge pull request #3092 from Anewbe/vox_fix
...
Might fix Vox blindness
2017-03-20 19:48:29 -05:00
Anewbe
ba321a3e5e
Merge pull request #3109 from VOREStation/decals
...
Flooring decals should work more places
2017-03-20 19:32:10 -05:00
nachomeep
83cc019562
Fixes phoron sprites. ( #3100 )
...
* Fixes phoron sprites.
* Re-adds the phoron-tank changes for the vox???
* touches up tank sprites
2017-03-20 19:31:42 -05:00
Leshana
5c3172389e
Make jukebox controllable by its wires
...
Added four extra hacking wires to the jukebox for Play, Stop, Next, and Prev. The main purpose is to allow attaching of singallers for remote controlling the jukebox.
2017-03-20 19:01:33 -04:00
Leshana
7558b365ef
Switch VOREStation jukebox to read track list from a configuration file.
...
Jukebox will read config/jukebox.txt to find its track list. This means tracks can be added/removed without recompiling the server.
2017-03-20 18:37:30 -04:00
Leshana
476b85a489
Merges VOREStation jukebox into standard jukebox
...
Fixes #1184 by simply eliminating the "/vore" sub-type of jukebox. Now that upstream jukebox has all of our hacking capabilities, we only need to sideways override New to update the songs list.
2017-03-20 18:31:55 -04:00
Leshana
d8c96082f4
Make jukebox controllable by its wires
...
Added four extra hacking wires to the jukebox for Play, Stop, Next, and Prev. The main purpose is to allow attaching of singallers for remote controlling the jukebox.
2017-03-20 18:24:18 -04:00
Arokha Sieyes
d565ef3dae
Merge pull request #1216 from Cameron653/master
...
Adds KiwiDaNinja's custom item
2017-03-20 10:11:43 -04:00
Arokha Sieyes
0de0e9316e
Merge pull request #1214 from VOREStation/aro-circlejerk
...
Relocate some map elements
2017-03-20 09:56:41 -04:00
Arokha Sieyes
ebfa18aeea
Fixed stupid rogue lines
2017-03-20 02:18:27 -04:00
Arokha Sieyes
a7b1e3f03b
Cleaned up comments
2017-03-20 02:17:45 -04:00
Poojawa
557579fca1
Adds feedback to vendor uprising
2017-03-20 00:49:11 -05:00
killer653
761ff80f55
Adds KiwiDaNinja's custom item
...
Solves #1200
2017-03-20 01:45:52 -04:00
Arokha Sieyes
c8e26b365a
Flooring decals should work more places
...
Such as shuttles. A good example is the trader ship which has hazard stripes mapped in, which don't appear in the game because it doesn't work there.
2017-03-20 00:51:17 -04:00
Arokha Sieyes
dbd44547bb
Flooring decals should work more places
...
Such as shuttles. A good example is the trader ship which has hazard stripes mapped in, which don't appear in the game because it doesn't work there.
2017-03-20 00:48:49 -04:00
Arokha Sieyes
6dd4339abe
Move the houseboat to z4
...
Also coincidentally provides tcomms to that level because it's really part of the same asteroid, though they can be turned off.
2017-03-20 00:48:00 -04:00
Anewbe
e2b3f0b9c1
Merge pull request #3106 from Leshana/vplk-thrown-objects-hit-windows
...
Fix thrown objects hitting windows not in their path
2017-03-19 21:38:22 -05:00
Anewbe
59a4f62668
Merge pull request #3078 from Leshana/vplk-atmos-leak
...
New Event: Atmos Leak
2017-03-19 20:22:42 -05:00
Atermonera
2d2763fdb0
Merge pull request #2 from PolarisSS13/master
...
There should probably be a way to do this automagically
2017-03-19 17:09:02 -07:00
Atermonera
530593508a
Gives surgeonborgs the full medical hud, because why don't they already have it?
2017-03-19 16:58:53 -07:00
Anewbe
b5866d5876
Merge pull request #3088 from Leshana/huhbots
...
Ports Bot Patrolling back to Polaris (Plus bot fixes)
2017-03-19 16:09:32 -05:00
Leshana
ef52ccbe4d
Fix thrown objects hitting windows not in their path
...
* Fixes windows counting as blocking the entire tile for thrown objects when they don't.
* Same thing for windoors, which have the same problem.
2017-03-19 17:06:38 -04:00
Arokha Sieyes
4d261e80a8
Merge pull request #1208 from VOREStation/aro-1202
...
Fixes ventcrawl
2017-03-19 12:36:29 -04:00
Arokha Sieyes
35d8c27b7c
AR-K HUD Band
...
Because I'm jealous of Scree's custom HUD.
2017-03-19 01:06:31 -04:00
Neerti
24b50fe2e6
Merge pull request #3098 from Leshana/mob-controller-runtime
...
Fix runtimes in controllers
2017-03-18 22:27:13 -04:00
Neerti
80c29e6213
Merge pull request #3102 from VOREStation/ventweld
...
Fixes ventcrawl
2017-03-18 21:27:41 -04:00
Arokha Sieyes
5425a06bc8
Fixes ventcrawl
...
Fixes #1202
2017-03-18 19:30:54 -04:00
Arokha Sieyes
0c763c0c1e
Fixes ventcrawl
...
Fixes #1202
2017-03-18 19:29:27 -04:00
Arokha Sieyes
2dbccc6016
Fix ported translator paths and map entries
2017-03-18 01:17:00 -04:00
Arokha Sieyes
94f352ab59
One more busy_space change
2017-03-18 01:16:45 -04:00
Arokha Sieyes
853de169ec
Remove unused defines for busy_space
2017-03-18 01:16:17 -04:00
Arokha Sieyes
878a250dc4
Readds Akula blood color
2017-03-18 01:16:03 -04:00
Arokha Sieyes
805b473976
Polaris Sync Merge
...
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
