Commit Graph

34854 Commits

Author SHA1 Message Date
Atermonera f863fa8f7f Merge pull request #6357 from Michiyamenotehifunana/HanalSprites
Resprites Health Analyzers and Adds Scanning Animations
2019-08-04 17:21:03 -04:00
Unknown 32d5efa915 Fixes Subtle Teleporter
Fixes a problem with the subtle teleporter not working outside of station Z Levels.
2019-08-04 13:46:38 -04:00
Wickedtemp ad03224230 Removes A Few Alternate Tool Options For 2 Surgical Operations (#6312)
* Update external_repair.dm

* Update neck.dm
2019-08-04 04:17:40 -04:00
Novacat 25fbfb57d6 Merge pull request #5555 from VOREStation/upstream-merge-6366
[MIRROR] Tweaks Security Bots
2019-08-03 13:19:58 -04:00
Novacat ac2f51ab2d Merge pull request #5554 from VOREStation/upstream-merge-6367
[MIRROR] Fixes Medibots Targetting FBPs
2019-08-03 13:19:17 -04:00
Anewbe 638579f26a Merge pull request #6366 from Nalarac/Bot2
Tweaks Security Bots
2019-08-03 13:05:55 -04:00
Anewbe 5563462171 Merge pull request #6367 from Nalarac/Bot3
Fixes Medibots Targetting FBPs
2019-08-03 13:04:43 -04:00
Anewbe 62774db0b3 Merge pull request #6361 from Nalarac/Helmet-Cameras
Changes Space Helmet Cameras to a Verb
2019-08-03 13:03:30 -04:00
Novacat 942b4d8caf Merge pull request #5548 from Screemonster/specieslinks
Adds quick wiki links to species pages
2019-08-03 08:44:35 -04:00
Novacat 20cefd6590 Merge pull request #5546 from Novacat/nova-basicfixes
Mining/Explorer Tweaks
2019-08-03 08:43:45 -04:00
Novacat c2463fc02b Merge pull request #5528 from Heroman3003/demotion
Replaces "Terminated" with "Dismissed" as default rank removal
2019-08-03 08:41:50 -04:00
Heroman a8e3b1e270 Replaces Terminated with Dismissed as default rank removal 2019-08-03 21:59:56 +10:00
Spades f15c7cd16e Merge pull request #5514 from CameronWoof/medical-sprites
Resprites Advanced Burn and Trauma Kits
2019-08-03 07:51:27 -04:00
Spades 4ce97f4a6e Merge pull request #5478 from mistyLuminescence/defib
Defib Scanners
2019-08-03 07:51:14 -04:00
Heroman e844f55f96 Fixes missing vorestation edits 2019-08-03 07:47:59 +10:00
Heroman 687fd0fc75 Allows players to select, customize and save whitelisted characters without whitelist 2019-08-03 06:59:00 +10:00
Novacat 75777c551e Merge pull request #5551 from VOREStation/upstream-merge-6359
[MIRROR] Updates Supermatter Guide Book
2019-08-02 14:27:21 -04:00
Anewbe 7977f50b1c Merge pull request #6359 from Nalarac/patch-5
Updates Supermatter Guide Book
2019-08-02 14:06:45 -04:00
Anewbe 341832b995 Merge pull request #6364 from Nalarac/Mecha2
Fixes Ripley Speedboost Being Uncreatable
2019-08-02 13:57:07 -04:00
Screemonster 1af24b1496 Adds quick wiki links to species pages 2019-08-02 12:49:08 +01:00
Unknown fb61850896 Mining/Explorer Tweaks
- ORM Vendor no longer provides phase pistols
- Steel Machete renamed to Plasteel Machete
- Industrial Hardsuit modules renamed to simply Hardsuit modules
- Adds some of the new mining stuff to the explorer vendor
- Fixes missing survivalfood flag from liquidprotein rations
2019-08-01 16:25:58 -04:00
Novacat d5b416f70b Merge pull request #5542 from VOREStation/upstream-merge-6328
[MIRROR] Makes Heavy-Duty Cell Chargers Constructable
2019-07-31 02:10:06 -04:00
Novacat dc9d475725 Update recharger.dm 2019-07-31 01:46:21 -04:00
Novacat f03ec2fbe8 Update recharger.dm 2019-07-31 01:45:15 -04:00
Novacat 7b4701f1d8 Merge pull request #5543 from VOREStation/upstream-merge-6354
[MIRROR] Adds proper miss chance for stabbing people in the eyes.
2019-07-30 20:29:53 -04:00
Novacat 4ce2695ee0 Merge pull request #5541 from VOREStation/upstream-merge-6353
[MIRROR] Adds shutoff valve monitor
2019-07-30 20:22:26 -04:00
Atermonera a175e70865 Merge pull request #6354 from MagmaRam/eyestabs
Adds proper miss chance for stabbing people in the eyes.
2019-07-30 20:19:46 -04:00
Atermonera 35e0eeec78 Makes Heavy-Duty Cell Chargers Constructable 2019-07-30 20:18:33 -04:00
Novacat b79076a62e Merge pull request #5512 from VOREStation/upstream-merge-6344
[MIRROR] Manifolds now obey the laws of pipes.
2019-07-30 20:05:42 -04:00
Atermonera 60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
Novacat ad1b2f134d Merge branch 'master' into upstream-merge-6344 2019-07-30 19:52:24 -04:00
Novacat 8ff1fc535f Merge branch 'master' into upstream-merge-6339 2019-07-30 19:51:16 -04:00
Novacat d844f233c4 Merge pull request #5508 from VOREStation/upstream-merge-6279
[MIRROR] Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.
2019-07-30 19:50:02 -04:00
Heroman 54be18505b Removes the leaks and related mechanics 2019-07-31 09:25:07 +10:00
Verkister 70b24a930a fixes sleeperbellies not ejecting on deletion
in the meantime, just avoid applying reset modules on borgos with occupants inside
2019-07-30 17:43:27 +03:00
Heroman fea0c9954d Adds missing //Vorestation Edit 2019-07-30 05:38:29 +10:00
Novacat b6cb12a825 Merge pull request #5536 from Heroman3003/quickfixports
Ports some fixes from Polaris early
2019-07-29 15:36:04 -04:00
Novacat 077c4441d4 Merge pull request #5477 from Wickedtemp/master
Allows Brute/Burn Healing Surgeries On Corpses
2019-07-29 15:35:43 -04:00
Heroman c82722cdbf Ports fixes from Polaris early 2019-07-30 05:23:32 +10:00
Spades 2ab5a99089 Merge pull request #5517 from mistyLuminescence/spice
Request Spice
2019-07-29 15:15:11 -04:00
Spades 04b98813fc Merge pull request #5509 from Heroman3003/dirt-nerf
Restricts random dirt spawning to plating tiles
2019-07-29 15:13:54 -04:00
Spades 85f2f6d16e Merge pull request #5475 from Sebbe9123/Awoospeak
Adds cursed speak autohiss
2019-07-29 15:09:37 -04:00
Heroman 64ee0d757a Fixes default teshari tails not matching color of body 2019-07-29 09:24:10 +10:00
Novacat 179a4b4127 Merge pull request #5496 from Mewchild/MC-DarkBar
Adds the Dark Bar to the Tether
2019-07-28 14:19:48 -04:00
Novacat 044e74f69b Merge pull request #5530 from VOREStation/upstream-merge-6349
[MIRROR] Fixes the metamorphic glass sprite for the B-52
2019-07-28 14:18:41 -04:00
Anewbe 41871ab937 Merge pull request #6351 from Heroman3003/fixthe3
Fixes 3 appearing to blind people when surgery table is used
2019-07-28 14:00:26 -04:00
Anewbe ffeb6ba7eb Merge pull request #6349 from MagmaRam/b52fix
Fixes the metamorphic glass sprite for the B-52
2019-07-28 14:00:16 -04:00
Novacat 50136a254c Merge pull request #5510 from VOREStation/upstream-merge-6303
[MIRROR] Combat Mechs Can Punch More Things
2019-07-27 17:40:22 -04:00
Heroman efb81f45fc Fixes merge errors 2019-07-28 07:08:18 +10:00
Heroman 0bc5d5b3ba Replaces Termination with Demotions as default rank removal 2019-07-28 06:46:05 +10:00