Commit Graph

3730 Commits

Author SHA1 Message Date
Leshana f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Neerti fc75357c61 Merge pull request #3054 from Anewbe/healthscanner
Oxyloss shows as cyan
2017-03-06 18:59:27 -05:00
Arokha Sieyes d6e0709fd0 Whups 2017-03-06 03:15:07 -05:00
Arokha Sieyes 4a768f8594 Makes nanopaste useful externally
Welders and wires repair 15 of brute and burn respectively, this only repairs 5 of both. So you can do it a lot faster with a welder/wires, but you can carry a nanopaste with you to fix that time you hit yourself with a box or something. Quick fieldwork w/o goggles and such.

Fixes #1105
2017-03-06 03:04:48 -05:00
Arokha Sieyes c7857a5bf3 Improves AR glasses, makes them available
Now you can start with them in loadout. They are no longer SUNglasses though, so they won't protect you from flashes.

There are several models, the loadout ones are the civilian ones.

- Civilian: Displays job ID icon based on the person's ID, and shows a health bar only if they are injured.
- Medical: Same as civlian, but displays advanced status (virus, borer, etc) along with backup implant status, and allows medical records access.
- Security: Same as civilian, but displays warrant and arrest status, and will automatically darken (electrochromic) in response to flashes, making the wearer immune, plus security records access.
- Engineering: Same as civilian, but will automatically darken to protect one's eyes during welding.
- Research: Same as civilian, but has a trendy goggle form factor for SCIENCE reasons.
- Omni: Has the combined features of all of the above. The only pair available spawns in the CD's office. (CC officers also)
2017-03-05 20:58:59 -05:00
Anewbe b4ec8eb026 Oxyloss shows as cyan 2017-03-05 14:19:51 -06:00
Leshana 81c4d7b5ab Made blueprints able to expand station areas into spae
* Added expand area capability, it will add connected space area turfs to the current area.
* Made the allowed area types vars so they can be more easily configured if needed.
2017-03-04 23:14:12 -05:00
Leshana 2c696c8033 Enhanced the room detection algorithm to use ZAS for airtight detection.
* Also reorganized the interact() menu to improve code organization.
* Also deleted some dead commented out code.
2017-03-04 23:14:12 -05:00
Leshana 2adce284ab Added diagnostic verbs to blueprints
* Added verb to highlight nearby areas.  Lets you actually see (in game) where area boundries are!
* Added a preview mode so you can see what new area the blueprints will make before it makes it.
* Both usable only while holding the blueprints, they go away when you drop them.
2017-03-04 23:14:12 -05:00
Leshana 340a393161 Extend Station Blueprints to consider outdoor mining areas as "space"
* Allows constructing new rooms out of the asteroid!  Previously blueprint couldn't because it wasn't technically "/area/space"
* Also moved the list of what area types count as space or protected to variables so its not a list embedded in the middle of a proc...
2017-03-03 20:12:03 -05:00
Anewbe facd055d07 Merge pull request #3037 from VOREStation/traybuckle
Fix two extra robust bugs
2017-03-03 18:23:25 -06:00
Leshana 8ede18c3ba Extend Station Blueprints to consider outdoor mining areas as "space"
* Allows constructing new rooms out of the asteroid!  Previously blueprint couldn't because it wasn't technically "/area/space"
* Also moved the list of what area types count as space or protected to variables so its not a list embedded in the middle of a proc...
2017-03-03 18:26:51 -05:00
Arokha Sieyes 3a8051b142 Merge pull request #1073 from VOREStation/aro-traybuckle
Fix two extra robust bugs
2017-03-03 16:43:36 -05:00
Arokha Sieyes f7c22dc54d Fix two extra robust bugs
Trays have no attack cooldown because they have this crazy-long snowflake code for attacks.

Beds (and children like chairs) don't track target for grab-buckle do_after, letting them run away and get teleported back to the chair and buckled regardless of their efforts.
2017-03-03 16:25:53 -05:00
Arokha Sieyes c4b25d6cf6 Fix two extra robust bugs
Trays have no attack cooldown because they have this crazy-long snowflake code for attacks.

Beds (and children like chairs) don't track target for grab-buckle do_after, letting them run away and get teleported back to the chair and buckled regardless of their efforts.
2017-03-03 16:25:13 -05:00
Arokha Sieyes 387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Anewbe bb2adf1290 Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system
Ports a large chunk of the map datum system that europa/bay uses.
2017-03-02 16:32:02 -06:00
Anewbe acf30da072 Merge pull request #3033 from VOREStation/surgidesc
Fixes descriptions on 3 surgical tools
2017-03-02 15:23:27 -06:00
Arokha Sieyes 55d5c2d615 Fixes descriptions on 3 surgical tools
Someone forgot theeeese. So they showed the "Ahelp this" description.
2017-03-02 14:08:13 -05:00
Leshana 12957f703b Added the Parts Lathe!
* The parts lathe can print tech level 1 stock parts (matter bins, capacitors) required to build basic unupgraded machines.
* This is a separate machine from the autolathe to ease any concern that the autolathe would become OP.
* ALSO, it can be hit with a circuit board and will conveniently display the parts required to build that board's machine.
* Added circuitboard and design for constructing a parts lathe.
2017-03-01 17:16:16 -05:00
Neerti 561f10bced Merge pull request #3013 from Anewbe/lung_cancer
Minor smoking update
2017-02-28 21:28:27 -05:00
Anewbe 8875c5ce1f Merge pull request #3027 from VOREStation/implanters
Make implanters able to be created
2017-02-28 20:26:48 -06:00
Arokha Sieyes 50a8b94294 Make implanters able to be created
Under 'medical' in the autolathe. 1 sheet metal, 1 sheet glass (syringes were 2 sheets total so just keeping with that).
2017-02-28 16:25:55 -05:00
Neerti 12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Anewbe a85e170ce4 Minor smoking update 2017-02-24 17:15:38 -06:00
Arokha Sieyes 4e6a3e6d11 Merge pull request #1030 from VOREStation/temp
Fix Tempest's Saddlebags, redo how Saddlebags Work
2017-02-23 19:32:28 -05:00
Arokha Sieyes 69097464ee Fix Tempest's Saddlebags, redo how Saddlebags Work
In the title!
2017-02-23 19:20:51 -05:00
Leshana ed78e7dbe9 Make vore jukebox re-constructable
* Put in our own circuit board so de-constructing and re-constructing gets the same machine back.
* Polaris now has all the same icon states as we do! We don't need our own jukebox_vr.dmi anymore.
2017-02-23 18:50:50 -05:00
Leshana 3781494933 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-23 18:25:37 -05:00
Spades 789037328d Merge pull request #1007 from Yoshax/voxvoxvox
Makes Vox spawn with a fancy dancy double emergency Phoron tank
2017-02-23 12:41:37 -05:00
Anewbe 9d0fd9b866 Merge pull request #3005 from Leshana/papershredder-enhancement
Enhances the Paper Shredder
2017-02-23 11:28:28 -06:00
Yoshax 64fd611a2c Makes Vox spawn with a fancy dancy double emergency Phoron tank 2017-02-23 13:48:50 +00:00
Leshana d7b82fc719 Added new "default_apply_parts" facility to machines to create default parts.
* Every constructable machine with a circuit board needs to create its required parts in its constructor.  These parts must be the same parts specified in the machine's circuit board, otherwise you get the wrong parts when you deconstruct.  This creates an opportunity for error which we can eliminate by reading the circuit board's part list and just adding those to the machine directly!  Plus its less tedious.
* Implemented it on the jukebox.
2017-02-22 17:28:24 -05:00
killer653 63ae45159d Tempest item, saddle adjustments 2017-02-21 20:55:09 -05:00
Leshana dbd3622588 Enhances the Paper Shredder
* Makes the paper shredder constructable and deconstructable.
* Switches to some new sprites which are animated!
* Machine now requires power, icons respond to power on/off etc.
2017-02-21 19:21:32 -05:00
Arokha Sieyes e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Yoshax 3162c723d9 Security non-lethal balance 2017-02-13 15:49:35 +00:00
Leshana 283b58e93d Fixes dragging clothing with storage onto an occupied hand
* If you mouse-drag certain items onto a hand which is already holding something, the item goes into limbo.
* The reason this happens is that the standard code handling drags is directly calling usr.u_equip, despite the comment on that proc clearly saying never to do that.  So it just throws it to limbo and the next line attempting to put it in hand does nothing becuase the hand is occupied.   Better way is to call unEquip, so the item will drop on the ground if it fails.
* Fixes https://github.com/VOREStation/VOREStation/issues/394
2017-02-09 14:49:13 -05:00
Arokha Sieyes 8f18996133 This should be the other way around 2017-02-06 16:21:06 -05:00
Arokha Sieyes 935ff411a5 Adds cloneloss to DNA Injectors
Makes sense, doesn't it? Messing with your genes? Each one doubles your cloneloss, starting at 2.
2017-02-06 16:01:28 -05:00
Anewbe 47a1fe134a Merge pull request #2978 from nachomeep/master
Adds fannypacks.
2017-02-05 18:07:01 -06:00
nachomeep c2ed062b3f Fixes custom loadout and slot system. 2017-02-02 15:37:27 -05:00
Cameron653 9cd1919fc6 Reverts vox change I made 2017-02-02 14:35:14 -05:00
nachomeep c81b18b40a adds fannypacks
To custom loadout as well.
2017-02-01 18:31:49 -05:00
Cameron653 82d021eb47 Makes vox tank spawn with nitrogen instead of phoron 2017-02-01 15:59:50 -05:00
killer653 3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe ccfbd7c9ac Mining outpost camera console should work now 2017-01-29 15:25:53 -06:00
Anewbe a6782f4371 Merge pull request #2944 from Anewbe/vox_toys
Adds and tweaks Vox toys
2017-01-26 22:42:53 -06:00
Arokha Sieyes d70d85220a Adds hypo for CMO and adds vials in chem for them to use 2017-01-24 01:47:57 -05:00
Anewbe ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00