Commit Graph

25227 Commits

Author SHA1 Message Date
Anewbe
77bd526404 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into thermals 2017-04-26 11:25:34 -05:00
Neerti
d89a3a4498 Merge pull request #3366 from LorenLuke/Self-Handcuffs
Can now apply handcuffs to oneself.
2017-04-25 23:43:06 -04: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
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
LorenLuke
c0be57b200 Adds adjacency check. 2017-04-25 10:55:21 -07:00
LorenLuke
3c4ff5e0bb Can now apply handcuffs to oneself. 2017-04-24 15:43:07 -07: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
Anewbe
5f9bdc5748 Merge pull request #3349 from LorenLuke/Body-Bag
Tweaks bodybag relaymove(). Allows exit from morgue trays while in bodybags.
2017-04-24 13:43:59 -05:00
Anewbe
ab86277af6 Merge pull request #3352 from Cerebulon/vendingpanels
Adds missing vending machine maintenance panel sprites.
2017-04-24 10:03:28 -05:00
Anewbe
66f432925e Merge pull request #3337 from Yoshax/tapedatebatehate
Changes tape coloring + slight rework
2017-04-24 10:01:00 -05: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
Cerebulon
d8e53bcc93 Adds missing vending machine maintenance panel sprites.
Soviet Soda given properly placed panel.
Dinnerware given new panel sprite.
Drying Rack uses new sprite instead of mismatched base smartfridge panel.
2017-04-23 14:20:49 +01:00
LorenLuke
b87fb2389f Adds morgue.dm changes. 2017-04-22 23:36:11 -07: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
c64bfe5e66 Makes the Rapid Service Fabricator use an actual glass, not the parent. 2017-04-22 17:51:21 -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
LorenLuke
a3fed84d29 Tweaks bodybag relaymove(). Allows exit from morgue trays while in bodybags. 2017-04-22 09:29:55 -07: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
Anewbe
1b2b63baf0 Merge pull request #3345 from Neerti/4/20/2017_radio_fix
Radios now work again in-hand or in pocket
2017-04-22 09:35:09 -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
Anewbe
b8d9c95445 Merge pull request #3294 from LorenLuke/Chairs-Away
Can buckle people adjacent to chairs.
2017-04-20 22:54:13 -05:00
Neerti
151ffe0038 Merge pull request #3291 from Anewbe/carp_lag
Kills carp lag
2017-04-20 23:42:29 -04:00
Neerti
80a3865acf Radios now work again in-hand or in pocket 2017-04-20 23:39:07 -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