Commit Graph

15961 Commits

Author SHA1 Message Date
Neerti
3c708e6a43 Merge pull request #3379 from VOREStation/zpipe-color
Fix zpipes losing color in-game.
2017-04-26 20:19:33 -04:00
Neerti
7ed721003c Merge pull request #3375 from Anewbe/gun_bug
Should fix the wounded accuracy gun bug
2017-04-26 20:18:10 -04:00
Leshana
25718bfa7b Fix zpipes losing color in-game.
* Colored zpipes (like scrubbers or supply for example) would always lose color in game becuase atmospherics machinery sets color = null since most pipes use overlays and the icon cache.  For better or worse, zpipes don't, they just use a normal icon_state, so they need color set.
2017-04-26 20:07:00 -04:00
Anewbe
a742986015 Tweaks how item slowdown works on certain species 2017-04-26 19:03:16 -05:00
Anewbe
8fb71a36eb Merge pull request #3364 from VOREStation/aro-pol-slurbolift
Allow turbolift specific-floor delays
2017-04-26 15:52:28 -05:00
LorenLuke
fb4a24fd38 Aim mode point blank targets on harm. 2017-04-26 11:26:31 -07:00
Anewbe
18c0b34704 Should fix the wounded accuracy gun bug 2017-04-26 11:34:00 -05:00
Anewbe
77bd526404 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into thermals 2017-04-26 11:25:34 -05:00
Anewbe
eda374cf83 Merge pull request #3356 from Neerti/4/23/2017_ling_nerfs
Adjusts Changelings
2017-04-25 22:04:37 -05:00
Neerti
2080350d08 Merge pull request #3368 from Anewbe/morpheus_ships
Adds more Morpheus ship names
2017-04-25 22:50:50 -04:00
Cerebulon
09cea78cdd Adds Unbranded monitor head.
https://gyazo.com/d37e65286cefb0d8611b8bd95747cc36
https://gyazo.com/e432d6a286c50f79f223725bcebd1733
https://gyazo.com/6f63caa3db135ff27ea5e9dcd77469f7
2017-04-26 02:56:24 +01:00
Anewbe
5f94cce5c7 Adds more Morpheus ship names 2017-04-25 19:11:41 -05:00
Anewbe
3fd1eb95b0 Merge pull request #3355 from Anewbe/siik
Sam is no longer in the list of words for Siik
2017-04-25 18:57:47 -05:00
Arokha Sieyes
248e5ca503 Allow turbolift specific-floor delays
If one floor is 'taller' than the others, or otherwise takes longer to traverse, you can set delay_time on the area to have it wait a different time there. Or, wait even less time, though less than 1 second isn't possible since the controller only fires every second.
2017-04-24 16:10:03 -04:00
Anewbe
40e58d6f5b Merge pull request #3363 from LorenLuke/buckle-give
Fixes 3314.
2017-04-24 14:44:55 -05:00
LorenLuke
af74306b43 Fixes 3314. 2017-04-24 12:03:04 -07:00
Neerti
a12fe9fa5a Merge pull request #3354 from Anewbe/vox_suit_tweak
Slowdown tweak on vox suit
2017-04-23 18:57:20 -04:00
Anewbe
08dedaaf98 Merge pull request #3353 from Neerti/4/21/2017_circuit_fixes
Circuit Bugfixes & QoL
2017-04-23 17:08:12 -05:00
Anewbe
13e9361f3e Merge pull request #3359 from Neerti/4/23/2017_drone_id
Adds Drone Identification Cards
2017-04-23 16:24:22 -05:00
Neerti
6dbff1ee83 Adds Drone Identification Cards
Drone FBPs now spawn with an EIO issued ID alongside their NT ID card.
Also makes the bartender's permit automatically name itself when created by the job_controller.
2017-04-23 16:30:32 -04:00
Anewbe
4e048463cb Fixes a chameleon gun bug 2017-04-23 15:23:15 -05:00
Neerti
4f3e3282b7 Merge pull request #3351 from Atermonera/Records
Brain type is shown on all records
2017-04-23 13:56:51 -04:00
Neerti
d6683be3ce Adjusts Changelings
See PR
2017-04-23 13:22:32 -04:00
Anewbe
1442528bfb Sam is no longer in the list of words for Siik 2017-04-23 11:08:29 -05:00
Anewbe
f9f039d96d Slowdown tweak on vox suit 2017-04-23 11:06:43 -05:00
Anewbe
8d8be1d52c Merge pull request #3350 from Mechoid/Drink_bot_the_Re-Drinkening
Service Borg 2: Drink Synthesizer and Rapid Service Fab changes.
2017-04-23 09:43:24 -05:00
Neerti
2c25fcec02 Fixes Circuit Bugs & QoL chances 2017-04-23 09:51:53 -04:00
Anewbe
751da2a195 Merge pull request #3347 from Anewbe/hooch
Stimm recipe changed
2017-04-22 20:50:23 -05:00
Anewbe
2a872bbd47 Merge pull request #3348 from VOREStation/zpipe-typo
Fix typo in zpipe proc name.
2017-04-22 20:22:34 -05:00
Atermonera
3f1194696a Brain type is shown on all records 2017-04-22 18:18:31 -07:00
Mechoid
fc924885eb Alphabetizes and Adds to the Borg Drink Synthesizer 2017-04-22 17:12:13 -07:00
Anewbe
79d9050476 Merge pull request #3311 from LorenLuke/Ventcrawl-fix
Fixes ventcrawling for spiderbots/implants/etc.
2017-04-22 17:21:04 -05:00
Leshana
23bcfbe28c Fix typo in zpipe proc name.
* The proc obj/machinery/atmospherics/pipe/up/process was supposed to be obj/machinery/atmospherics/pipe/zpipe/process.
* Also changed hard coded integers to use constants while I was editing the file anyway.
2017-04-22 17:05:20 -04:00
Anewbe
09deafb761 Merge pull request #3334 from Cerebulon/xenoheadgear
Adds/Ports unique Rig Suit and Mask sprites for Unathi and Tajara
2017-04-22 09:37:40 -05:00
Anewbe
04971fcbb4 Merge pull request #3346 from VOREStation/cable-directions
Port multi-z cable improvements from Baystation
2017-04-22 09:36:56 -05:00
Anewbe
2e9383d6ac Merge pull request #3339 from VOREStation/aro-pol-computericon
Removes all the hard references to computer.dmi
2017-04-22 09:36:40 -05:00
Anewbe
0207066256 Merge pull request #3332 from VOREStation/aro-pol-planets
Controllerized Planets
2017-04-22 09:36:04 -05:00
MagmaRam
cc3092859a Merge pull request #3344 from Anewbe/ion_holster
Adds ion pistol to uplink, allows holstering
2017-04-22 08:10:28 -05:00
Anewbe
28c4d5a4d8 Stimm recipe changed 2017-04-21 22:05:14 -05:00
Anewbe
a4d9db202b Allows ion pistol on the belt. 2017-04-21 19:24:06 -05:00
Leshana
30d2f16b04 Replace color macros and stream operator with style and to_chat 2017-04-21 11:22:08 -04:00
comma
f614de8387 Updates cable construction
FOrgot to update it to new direction whoops.
Also makes powernet connectino proc for cables multiz aware.
Port of: https://github.com/Baystation12/Baystation12/pull/15940
2017-04-21 11:22:07 -04:00
comma
5f2d23fbd7 Makes cable use BYOND directions
Instead of 11,12 they use 32,16 for DOWN,UP
Merges multiz handling into main logic
Port of: https://github.com/Baystation12/Baystation12/pull/15907
2017-04-21 11:22:07 -04:00
Neerti
151ffe0038 Merge pull request #3291 from Anewbe/carp_lag
Kills carp lag
2017-04-20 23:42:29 -04:00
Anewbe
59a19f7197 Merge pull request #3330 from VOREStation/footstep-sounds
Implements footstep sound system and adds sounds to various floor types.
2017-04-20 21:10:28 -05:00
Anewbe
e17eccae93 Adds ion pistol to uplink, allows holstering 2017-04-20 20:04:21 -05:00
Neerti
31724dbb5a Should fix a holser runtime. 2017-04-20 19:55:29 -04:00
Neerti
baac0efffb Merge pull request #3266 from Anewbe/scratch_damage
Armor soak now caps at 80% of incoming damage
2017-04-19 23:33:30 -04:00
Cerebulon
1281c75a14 murdered a comma 2017-04-19 23:59:40 +01:00
Cerebulon
fc974f1dd9 Removed missed bit of sprite code in luchador masks. 2017-04-19 23:55:12 +01:00