Commit Graph

3755 Commits

Author SHA1 Message Date
Arokha Sieyes
9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Cerebulon
6472f02040 Removed unnecessary icon_state code. Added basic scanner sprite. 2017-03-26 22:00:09 +01:00
Cerebulon
3c17d1b33f Added in-hand sprites to most item lacking them from the Medical department.
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
2017-03-26 07:04:01 +01:00
Cerebulon
38571fb8bc Adds in-hand sprites to several items.
Hand labeller, light replacer, megaphone, binoculars, powersink, suit cooler and lantern.
2017-03-23 22:03:17 +00:00
MagmaRam
e3a87c1c78 Merge pull request #2985 from Anewbe/more_pdas
Adds rugged style PDAs
2017-03-22 19:42:19 -05:00
Leshana
f0270451a7 Added vore capabilies to the new simple_animal system.
* Added happy friend time mechanics working properly for fox and cat.
* Added vore mechanics and vore overrides
* No longer enable vore on simple animals by creating a "/vore" subtype.  Instead we simply enable vore on the main type.  Consensus being we don't need a type for non-vore versions of stuff.
  * This allowed us to revert many path references throughout the codebase to the original non-vorestation back to their original values.  In these cases the "Vorestation Edit" comment is removed.
* Moved the vore overrides for upstream simple animals into its own file zz_vore_overrides.dm
2017-03-22 19:32:19 -04:00
Anewbe
538f91c202 Borg stun arm should work now. 2017-03-22 17:06:16 -05:00
Arokha Sieyes
be9bcf81f0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-03-21 11:22:29 -04:00
Anewbe
c65588b099 Communicator QoL 2017-03-21 00:51:26 -05:00
nachomeep
83cc019562 Fixes phoron sprites. (#3100)
* Fixes phoron sprites.

* Re-adds the phoron-tank changes for the vox???

* touches up tank sprites
2017-03-20 19:31:42 -05:00
Leshana
476b85a489 Merges VOREStation jukebox into standard jukebox
Fixes #1184 by simply eliminating the "/vore" sub-type of jukebox.  Now that upstream jukebox has all of our hacking capabilities, we only need to sideways override New to update the songs list.
2017-03-20 18:31:55 -04:00
Arokha Sieyes
805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Anewbe
bf307ac0dc Translators can't output hive or nonverbal languages 2017-03-15 20:56:18 -05:00
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Neerti
e08b8edbd3 Merge pull request #3077 from Anewbe/translator
Ports the translator
2017-03-14 21:23:13 -04:00
Anewbe
ab1812d9ff Adds the ear translator 2017-03-13 20:03:45 -05:00
Arokha Sieyes
6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
2017-03-13 01:29:01 -04:00
Anewbe
e2680eff87 Merge pull request #3063 from Anewbe/tank_fix
Changes tank sprite for Vox
2017-03-12 19:26:07 -05:00
Arokha Sieyes
4c0e330140 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync 2017-03-11 18:47:17 -05:00
Anewbe
f4dd443b01 Ports the translator 2017-03-10 21:46:57 -06:00
Anewbe
7130d56b80 Merge pull request #3064 from Woodratt/WR_SC_Changes
WR_SC_Map_Changes
2017-03-08 19:58:46 -06:00
woodratt
19fb047f01 WR_SC_Map_Changes
- Fixes sprite issues with departmental intercoms.
- Tweaks to the random objects dm
- Copies Bay's flora and warning sign list, as well as ports some of their signs.
- Addition of a couple new floor decals.
- New table preset, wooden reinforced.
2017-03-08 17:44:48 -08:00
Anewbe
0465613465 Changes tank sprite for Vox 2017-03-08 12:36:43 -06:00
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
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -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