Commit Graph

19271 Commits

Author SHA1 Message Date
Arokha Sieyes
ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Arokha Sieyes
05864e06ea Merge pull request #2719 from VOREStation/aro-layer
Make laying people be under other people
2018-01-09 20:33:54 -05:00
Arokha Sieyes
68e7efa2b2 Merge pull request #2718 from Cyantime/boxfix
Actually fixes snakesnack box
2018-01-09 20:25:16 -05:00
Cyantime
be875510f3 Actually fixes snakesnack box 2018-01-09 18:51:14 -05:00
Arokha Sieyes
0bee7979d9 Make laying people be under other people
Unsure what consequences this would have. PLEASE REVIEW. (It works fine ingame, but I can't test every object with every mob)
2018-01-09 18:16:17 -05:00
Cyantime
81937179ec Fix snakesnack box 2018-01-09 18:06:03 -05:00
Leshana
807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
Arokha Sieyes
12b8eccb09 Merge pull request #2707 from VOREStation/aro-armoryagain
Redesigns the armory
2018-01-09 12:04:23 -05:00
Arokha Sieyes
fafd5cb0bd Merge pull request #2710 from VOREStation/aro-nifcryo
Despawn NIF occupants in cryo
2018-01-09 11:56:15 -05:00
Leshana
ca880019e8 Refactor NSFW gun code to be robust against bad data conditions. 2018-01-08 22:43:57 -05:00
Arokha Sieyes
636f9601b7 Despawn NIF occupants in cryo
Fixes #2683
2018-01-08 13:59:52 -05:00
Verkister
d8f3a7d972 Updates science borgo for the updated icon stuff
dogborg is true
2018-01-08 17:01:09 +02:00
Arokha Sieyes
e43bdacf21 Redesigns the armory 2018-01-08 01:00:41 -05:00
Cyantime
46c99cca03 Improves medibot speaker switch 2018-01-07 22:09:43 -05:00
Arokha Sieyes
080a9234d6 Merge pull request #2699 from kcin2001/scidog
adds i new science dogborg and 2 dogborg reskins
2018-01-07 21:35:55 -05:00
Arokha Sieyes
df5151793f Merge pull request #2703 from Cyantime/NOODLE
Returns Noodle to the CE office
2018-01-07 21:35:46 -05:00
Arokha Sieyes
a172221502 Merge pull request #2693 from blazerules/master
Electrostaff sheath fix
2018-01-07 21:35:13 -05:00
Arokha Sieyes
20225b9c46 Merge pull request #2697 from Mewchild/master
Bone Signet Ring
2018-01-07 21:30:25 -05:00
Cyantime
6e50929df5 Fixes 2018-01-07 12:56:07 -05:00
blazerules
846bb26f28 Electrostaff sheath fix
Added new held item sprites.
2018-01-07 18:44:50 +02:00
Cameron653
898871e680 Update reagents.dm 2018-01-07 06:05:33 -05:00
Cameron653
5f2a7512e7 Lowers slime jelly cost, ups nutriment cost. 2018-01-07 00:35:30 -05:00
Arokha Sieyes
7dd9bd3e55 New Science Dogborg 2018-01-07 00:05:10 -05:00
Cyantime
af8cec54ab Fixes gravekeeper module wood synth, fixes typo in gravekeeper lawset (#4506)
* Fixes gravekeeper module wood synth, fixes typo

* Gives the grave gripper a name
2018-01-06 20:20:01 -06:00
Arokha Sieyes
b9e8b9641c Various and sundry admin messages 2018-01-06 19:15:54 -05:00
Mewchild
a3d9ea5659 Bone Signet Ring 2018-01-06 16:51:06 -06:00
Leshana
224fe42e77 Prepare Atmospherics Machinery for SSatoms (#4501)
* to_chat() replacement.

* Revert calling target.init_dir() before connecting.

* This change was added in https://github.com/PolarisSS13/Polaris/pull/3775 to counteract `dir` not being set prior to New() for dynamically loaded maps.  The root cause was /atom/New() not calling _preloader.load().  Undoing the change now that /atom/New() is fixed.
* The addition of the init_dir() proc itself however, is useful, because there ARE other times some atmos machinery will want to re-initialize its dir, specifically whenever it is rotated.
* init_dir() must be called in the constructor of all atmospherics machines capable of connecting to another.   Since it has to happen for ALL machines, lets move that call to /obj/machinery/atmospherics/New()

* Rename /obj/machinery/atmospherics initialize() to atmos_init()

* These days `initialize()` is used to handle general object initialization that is moved outside of New().  The node connection discovery of atmos machinery needs to happen after all that, and so needs to be in a separate proc.
* Make sure to actually call atmos_init during system startup.
2018-01-06 10:52:56 -06:00
blazerules
b8f77619f2 Electrostaff sheath fix
For some reason changing it to box/fluff broke it. Can't... put my finger on why. But it works as a backpack so alls good.
2018-01-06 13:03:31 +02:00
Cameron653
afaa89ff26 Makes alcohol have effects when injected. (#4471)
* Makes alcohol have effects when injected into veins

* Makes Ethyl work on it when in bloodstream.

Should work this way.

* No nutrition
2018-01-06 00:04:49 -05:00
Cyantime
ebb8d287cf Returns noodle to the CE's office 2018-01-05 22:56:33 -05:00
Arokha Sieyes
cd3a332fd2 Merge pull request #2690 from VOREStation/aro-commlinkqol
Commlink QoL
2018-01-05 21:36:14 -05:00
Arokha Sieyes
950cea6c34 Merge pull request #2689 from VOREStation/aro-sizegunqol
Sizegun QoL/Nerf
2018-01-05 21:36:06 -05:00
Arokha Sieyes
82a9a3c89e Sizegun verb change 2018-01-05 20:56:07 -05:00
Arokha Sieyes
f0023b5c9a Commlink QoL
Makes it properly auto-register your name instead of coming as Unset every time.
Makes messages to Commlinks properly stay in the commlink user's head.
2018-01-05 17:57:39 -05:00
Arokha Sieyes
1183e5fa80 Sizegun QoL/nerf
I want clicking it in-hand to let me change the size (so I can do it with Z). And I want the box to show the currently set size when I'm changing it instead of always just showing 200. So that's what it does now.
Also jeez. If we have the technology to make a military-grade battery recharge in just a few seconds, why don't we use it other places? Makes the thing not self-recharge. Just stuff it in a recharger. There are plenty.
Added various rechargers everywhere in public places on the map, since there weren't enough, just to be sure.
2018-01-05 17:16:23 -05:00
Arokha Sieyes
e3188db869 Merge pull request #2686 from VOREStation/aro-nifprom
Allows special Promethean NIF installation
2018-01-05 14:49:12 -05:00
Arokha Sieyes
d5ec045b1a Allows special Promethean NIF installation
Just shove it directly into their face. Make sure it's a bioadaptive one though otherwise it won't do anything.
Target head, click, wait a while. They ARE slime people or whatever so... makes sense :V
2018-01-05 14:30:14 -05:00
Leshana
6b87ecd2b8 Merge pull request #2685 from VOREStation/aro-lessmagic
Tweak lethal succubus drain
2018-01-05 14:22:39 -05:00
Leshana
65724afe58 Merge pull request #2687 from VOREStation/aro-sani
Fixes a couple of charsetup sanitizes
2018-01-05 14:22:07 -05:00
Leshana
f50d5153ff Merge pull request #2681 from VOREStation/aro-nsfwhos
Gives the HoS a KHI-102b NSFW
2018-01-05 14:21:59 -05:00
Anewbe
2b2a5dc565 Merge pull request #4503 from Neerti/1/1/2018_bonfires
Adds Bonfires
2018-01-05 13:36:19 -05:00
Arokha Sieyes
13b28ede55 Fixes a couple of charsetup sanitizes
No more "YOU DIDN'T SET A SCALEEEEE" on new characters. Defaults to 100%.
2018-01-05 12:28:15 -05:00
Arokha Sieyes
1110d6cf82 Tweak lethal succubus drain
Mostly remove the OOC magic-implying wording about 'life energy' (since setting is w/o magic) so it can be whatever in your private RPs (someone was asking about using it to represent stealing bodyheat which is cool).
`absorbing_prey` was never unset if they were found to be indigestible, so fixed that
Two stages also sent two messages at the same time
Removed the needless casting of src to C since it's defined on human already

Maybe in the future consider using cloneloss instead of brainloss? Alkysine is one of the easiest drugs to make, and if I jack myself up with it I'd maybe be immune to having my nutrition/heat/whatever stolen which seems ~unusual~
2018-01-05 10:59:20 -05:00
Arokha Sieyes
ce0b3e9678 Merge pull request #2664 from Verkister/buppers
Fixes non-dogborgs butting into dogborg icon update territory.
2018-01-05 10:11:13 -05:00
Arokha Sieyes
7bd32b056d Merge pull request #2676 from Screemonster/bellybugs
Fixes some bugs relating to absorption and struggling, makes struggle feedback messages clearer
2018-01-05 10:10:46 -05:00
Arokha Sieyes
5a81cbefba Merge pull request #2671 from blazerules/master
Electrostaff Custom Item
2018-01-05 10:08:32 -05:00
Arokha Sieyes
82f373aa1e Merge pull request #2672 from Cameron653/EMERGENCY
January Sync
2018-01-05 10:04:41 -05:00
Neerti
42a421e8e1 Adds Bonfires 2018-01-05 02:35:19 -05:00
Arokha Sieyes
5c6637cffa Gives the HoS a KHI-102b NSFW
It's just my fluff gun. But sharing is caring.

From the ingame fluff:
"Variety is the spice of life! The 'Nanotech Selectable-Fire Weapon' is an unholy hybrid of an ammo-driven energy weapon that allows the user to mix and match their own fire modes. Up to three combinations of energy beams can be configured at once. Ammo not included."
"This gun is an energy weapon that uses interchangable microbatteries in a magazine. Each battery is a different beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type."
"The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding."

The HoS's includes 2 lethal, 2 stun, 1 net, and 1 ion battery. There are other batteries (like instagib!) but there's no way to get them normally. There's also one that strips people.
2018-01-04 23:57:11 -05:00
Leshana
968697d02e Replaced world.tick_usage with TICK_USAGE macro in VOREStation code 2018-01-04 22:57:00 -05:00