Commit Graph

27215 Commits

Author SHA1 Message Date
Anewbe
05e9ae8cb1 Merge pull request #4767 from Screemonster/twoforthepriceofone
removes redundant override in human emp_act()
2018-02-10 00:10:00 -06:00
mistyLuminescence
fa6ff94474 What's Yours Is Mined (#4556)
* Boom!

* Wires!
2018-02-09 18:56:46 -08:00
Anewbe
e58e97c449 Merge pull request #4758 from VOREStation/vplk-airlocks-cycle-to-ext
"Planetary" Exploration Airlock Controller
2018-02-09 16:48:43 -06:00
Anewbe
cc710a3afd Merge pull request #4761 from Neerti/2/8/2018_shield_gen_tweaks
Tweaks Shield Generators
2018-02-09 16:26:37 -06:00
Anewbe
f5b6f155cc Merge pull request #4762 from Verkister/patch-3
Fixes vis_enabled becoming unobtainable if something happens to apply plane_holder to mob before client
2018-02-09 16:26:02 -06:00
Mechoid
736134d10f Merge pull request #4707 from Cerebulon/virologyRetoothing
Gives Virology teeth again
2018-02-09 11:49:45 -08:00
Screemonster
47319874fb removes redundant override in human emp_act() 2018-02-09 06:19:02 +00:00
Cerebulon
2e0d873ba5 Fixed duplicate deafness 2018-02-09 03:46:44 +00:00
Anewbe
f0ce7f9643 Falling one floor is no longer a death sentence (#4759) 2018-02-08 12:59:24 -08:00
Mechoid
251297a2ba Promethean Balancing, Lore-compliant Modification of Security Equipment (#4722)
* Works on Balancing Prometheans

* Reorganize from Master Merge

* Tries to fix that gun conflict that the DMI merger apparently did fine?
2018-02-08 14:58:17 -06:00
mistyLuminescence
4e4ba35444 Surgeon/Research/Medimerc borg fixes. (#4751)
* Surgeon borg fixes.

* Merc combat medic borgs too.

* No med stacks

* chembags

* no chem bags (sorry, I tried!)
2018-02-08 14:44:41 -06:00
Anewbe
f25da053a7 Merge pull request #4753 from Atermonera/ethyl_fix
Ethylredox removes alcohol
2018-02-08 14:36:12 -06:00
Anewbe
62d1e6c00d Merge pull request #4757 from Cyantime/patch-2
Reduces armor values on the vey-med voidsuit
2018-02-08 14:34:12 -06:00
Anewbe
1642848db7 Merge pull request #4754 from VOREStation/vplk-id-refactor
Fix IDs so they do not instantiate every job datum on New
2018-02-08 14:32:42 -06:00
BillyBangles
64b98e0dae Adds 2 new cave POIs (#4743)
* adds temple and ritual POIs

as well as ever-burning candles, a candleabra, and a neat red crystal that looks like supermatter but isn't

* fixes all cases of 'candelabra' spelling

i am a dunce

* fixes main map changes

i don't even know what i fuckin did to this thing??? ?? ??? ???

* removes unnecessary light() proc
2018-02-08 14:10:02 -06:00
Cameron653
1bb37998eb Makes teshari hide work once more. (#4745)
* Makes teshari hide work (+1 squashed commits)

Squashed commits:

[93fd7b7] Makes teshari hide function correctly oncemore.

* Changes the stun check to a method that actually works.

* boop~
2018-02-08 14:08:19 -06:00
Verkister
78533e328b Fixes vis_enabled becoming unobtainable*
*(If something happens to apply plane_holder to mob before login)
Yeah a feature somewhere down there relied on the mob getting its plane_holder before client (and thus making the only vis_enabled init right here that required the lack of plane_holder on login completely unobtainable) and I was vaguely told to fix this here instead of fixing the forementioned downstream feature.
2018-02-08 19:27:24 +02:00
Neerti
ceb0b93068 Tweaks Shield Generators
Adjusts numbers on shield generators, so that they can protect the station with roughly similar amounts of power they would need on the old map, before multiZ.
Cleans up a bit of initialization code for shield gens.
2018-02-08 05:37:56 -05:00
Neerti
cce2d5cd4c Merge pull request #4741 from MarinaGryphon/shuttlefix
Fixes #4669.
2018-02-08 00:38:48 -05:00
Anewbe
a80f9d345e Merge pull request #4746 from Cyantime/defibruntime
Fix paddle runtime
2018-02-07 23:34:44 -06:00
Anewbe
ce92a992ca Merge pull request #4747 from Woodratt/02062018_MapfixesShuttleupgrde
Shuttle Upgrades and Map Fixes
2018-02-07 23:33:33 -06:00
Leshana
4c910f0f2e Port cycle_to_external_air mode for airlock controllers.
* Adds a flag to controllers that instructs the airlock program to always purge between IN/OUT and also to pump air to "outside" instead of tanks when purging to go OUT.
* Tweak the way the airlock fudges target pressures so it more reliably operates when trying to pump down to vacuum.
* Adds an exterior airlock sensor that reads the air pressure in *front* of it, so it can be mounted on a shuttle but measure air outside the shuttle.
2018-02-07 17:32:15 -05:00
Hubblenaut
9db9681663 Cycling Airlocks Tweak
When cycling into a direction the airlock has already reached the target
pressure for, doing so will only toggle the doors.
2018-02-07 17:31:56 -05:00
Cyantime
b31a108083 Reduces armor values on the vey-med voidsuit 2018-02-07 17:07:06 -05:00
Leshana
f741bba7cb Fix IDs so they do not instantiate every job datum on New
Every ID was instantiatating and deleting a copy of *every* job datum in its New().  Thats silly.  Switch to initialize so job_master is available.
2018-02-07 16:38:37 -05:00
atermonera
05fe601430 Ethylredox removes alcohol 2018-02-07 13:17:00 -08:00
Anewbe
442b5cbdf6 Comments out the automatic firemode code (#4748) 2018-02-07 09:59:42 -08:00
Neerti
54d7537f9c Merge pull request #4738 from Anewbe/hypospray_changes
Hyposprays and autoinjectors have a delay when used on a target that is not in help intent
2018-02-07 04:49:04 -05:00
Woodratt
7ee2b5266a Shuttle Upgrades and Map Fixes
- Upgrades the shuttles with enviroment sensors and the ability to see if the rear hatch is open.
- Gun cabinets station side in the hangar control rooms. Explorer, Pilot, Armory Access.
- Surgery room redesign, replaced closets with wall closets.
- Multiple other smaller map bug fixes.
2018-02-06 22:58:44 -08:00
Anewbe
8dcaeed33d Merge pull request #4728 from Cyantime/patch-1
Attacked mobs will always target attacker
2018-02-06 23:59:23 -06:00
Neerti
2cb7aab49c Merge pull request #4733 from Anewbe/budget_insulated
Budget Insulated Gloves tweaks
2018-02-07 00:52:56 -05:00
Burrito-Justice
e813ce4666 Updates all medical sprites to Bluebay (#4712)
* Updates all medical sprites to bluebay

* Forgot Odysseus w h o o p s

* heck forgot to change thing
2018-02-06 23:11:09 -06:00
Andromeda-K22
58cf8000ba Automatic firemode for guns (#4730)
* New gun firemode: automatic

Full-auto destruction at the tip of your fingers! If you're an admin. Switch the automatic var to 1 to make any gun automatic.

This code is largely donated by Mport and the SS:CM project. Relevant modifcations are located in automatic.dm, special.dm, and automagical.dm

* Removes '/blue's

* Removes a block of pseudocode.

* Welp. Missed some things.

* Automatic removed from the Suppression gun, as requested by @Anewbe in #4730

* Requested changes.
2018-02-06 22:57:53 -06:00
Cyantime
5816d717f7 Fix paddle runtime 2018-02-06 23:57:44 -05:00
Anewbe
d4a1abbcf2 Merge pull request #4734 from VOREStation/vplk-turret-control
Turret controls can reference their control area by path
2018-02-06 22:57:27 -06:00
Cerebulon
e7bab878ba Capped antibiotic resistance at 90% and at-generation maximum to 70, other requested changes already implemented. 2018-02-07 04:06:13 +00:00
Cerebulon
d592d1fc17 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into virologyfixes 2018-02-07 03:40:06 +00:00
Anewbe
a234890b76 Merge pull request #4735 from elgeonmb/patch-3
moves us out of the kara system, pt 1
2018-02-06 21:08:12 -06:00
Anewbe
0d7fc11540 Merge pull request #4736 from elgeonmb/patch-4
moves us out of kara, pt 2
2018-02-06 21:07:56 -06:00
Anewbe
e40600c1e5 Merge pull request #4729 from VOREStation/vplk-ss-xenoarch
Move Xenoarcheology globals and initialization into a subsystem
2018-02-06 16:09:33 -06:00
Anewbe
e565108ce7 Hyposprays and autoinjectors have a delay when used on a target that is not in help intent 2018-02-06 13:35:30 -06:00
Neerti
3fd1571a4b Merge pull request #4724 from Anewbe/ghettoChutes
Fixes ghetto chutes
2018-02-06 14:14:30 -05:00
Neerti
8f0cb65b4f Merge pull request #4732 from elgeonmb/patch-2
very small grammar fix
2018-02-06 14:13:04 -05:00
Neerti
b8aa3ec0fc Merge pull request #4742 from MarinaGryphon/landing-fix
Fixes #4740.
2018-02-06 14:11:32 -05:00
Neerti
563d62d663 Merge pull request #4731 from Anewbe/phase_pistol
Phase pistol
2018-02-06 14:06:17 -05:00
Marina Gryphon
42e896da0d Should fix #4740. 2018-02-06 11:28:26 -06:00
Marina Gryphon
cb3a058aa3 Closing parenthesis. 2018-02-06 11:10:28 -06:00
Marina Gryphon
3b6830de50 Should compile now, oops. 2018-02-06 11:08:04 -06:00
Marina Gryphon
6a3e2fd239 Clarifies comments, reduces line change. 2018-02-06 10:53:20 -06:00
Marina Gryphon
1a005898a0 Makes sure that Z-shadows get updated on move_contents_to being called. Fixes #4669. 2018-02-06 10:51:32 -06:00