Commit Graph

12828 Commits

Author SHA1 Message Date
Arokha Sieyes
65cb118f93 Merge pull request #1170 from VOREStation/aro-advmedbleed
Fix internal bleeding on adv med scanners
2017-03-13 01:53:14 -04:00
Arokha Sieyes
0bb3a71625 Merge pull request #1169 from VOREStation/aro-newpolsync
Polaris Sync
2017-03-13 01:50:11 -04:00
Arokha Sieyes
7123396663 Fix internal bleeding on adv med scanners
The nanoui template expects "internalBleeding" to be in the organStatus list, not in the organData list. I agree with this expectation, as this is also where normal "bleeding" is stored, so I updated the adv_med.dm file rather than changing the template.
2017-03-13 01:43:38 -04: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
Arokha Sieyes
c6e8ab9e1b Merge pull request #1167 from VOREStation/aro-nfoods
Add several new foods
2017-03-13 01:21:10 -04:00
Arokha Sieyes
e4a99ccae4 Update my favorite vendor while I'm at it. 2017-03-13 01:03:25 -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
a0c4b05ec3 Some map tweaks
Mostly area placement tweaks in the bar so it's not "two" areas, renamed the "longue" to be spelled right, fixed a christmas tree, fixed a disposals pipe.
2017-03-12 00:12:32 -05:00
Arokha Sieyes
91ec566408 The ultimate in food vending
Since some foods were removed.
2017-03-11 19:28:14 -05:00
Arokha Sieyes
55b2bd3b95 I guess these foods are gone or moved. 2017-03-11 19:00:43 -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
Arokha Sieyes
a25539122a Merge pull request #1156 from Screemonster/patchingbulkheads
makes broken doors patchable
2017-03-10 18:07:36 -05:00
Screemonster
aace86cbc4 returning an actual value might help 2017-03-10 21:57:39 +00:00
Screemonster
c9032e1539 makes broken doors patchable 2017-03-10 21:44:28 +00:00
Arokha Sieyes
57f475392e Replace backup implant boxes with special implanter
Stores 4 inside the implanter, so medical people can just carry one with them if they want. Added more to the vendors to offset the smaller number per thing (7 per box vs 4 per implanter). The sprite is unique, and represents how many are left on the outside. Orange means just one left, flashing red means empty.

You can take the implants out if you want, swap them between implanters, etc. This one is self-cleaning, and can't cause infections, yay. So if you have to leave one in the lobby for people, now you don't have to feel bad about horrible cross-contamination?
2017-03-09 23:13:52 -05: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
Arokha Sieyes
fa59590019 Merge pull request #1135 from VOREStation/aro-adminbus
WIP Event ship and smaller shuttle
2017-03-08 18:28:55 -05:00
Arokha Sieyes
80e513657c WIP Event ship and smaller shuttle
WIP on Virgo-2.dmm, Joan must help finish it :O
2017-03-08 17:57:29 -05:00
Anewbe
0465613465 Changes tank sprite for Vox 2017-03-08 12:36:43 -06:00
Anewbe
96d94410df Merge pull request #3048 from nachomeep/gas
Makes phoron very purple.
2017-03-08 10:52:53 -06:00
nachomeep
a53b196e13 missed a line 2017-03-08 08:05:41 -05:00
Leshana
12ab0e4da2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 2017-03-06 22:46:28 -05:00
Leshana
a5a805414b Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not.  The changling subtype prevented any compile errors.
2017-03-06 21:58:39 -05: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
nachomeep
afcd662beb turns all phoron purple 2017-03-06 17:54:40 -05:00
Arokha Sieyes
abf2e8af69 Resleeving tweaks, fix compile warning
Resleeving console now lists people in alphabetical order, and removes bodies when the person cryos (as long as they were really in that body, you can't cryo someone's printed body w/o resleeving and have it remove them)
2017-03-06 14:22:11 -05:00
Leshana
8355428e4e Adds Supply Shuttle Hook
* Adds a global hook for when the supply shuttle reaches centcom.  The existing sell_crate hook is too limited, as it only detects what is in crates, and is fired many times, making it hard to produce a summary for events that might want stuff shipped on the shuttle.
2017-03-06 12:36:19 -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
d68292b236 Merge pull request #3002 from Anewbe/plant_things
Space Vines are more dangerous
2017-03-05 14:15:13 -06:00
Anewbe
05e6ef5ad8 Merge pull request #2988 from Anewbe/boots
Boots are now a subtype of shoes
2017-03-05 14:13:47 -06:00
Anewbe
e2a9b64174 Merge pull request #3043 from Leshana/blueprints
Extend Station Blueprints to consider outdoor mining areas as "space"
2017-03-05 14:11:45 -06:00
Anewbe
26399c0e43 Merge pull request #3044 from VOREStation/cryo
Make cryo recursively remove mobs
2017-03-05 14:09:30 -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
Anewbe
283071d9db Merge pull request #3035 from Neerti/3/2/2017_example_map
Adds Multi-Z Test Map
2017-03-04 15:26:49 -06:00
Arokha Sieyes
4533150c67 Make cryo recursively remove mobs
So if a mob is being held, like a Teshari, or anything else ~~like being eaten cough~~ then they are handled correctly by cryopods. Otherwise if someone scoops a Teshari, and cryos, they are simply deleted, their records stay in the round, their job slot is occupied indefinitely, etc.
2017-03-04 01:39:42 -05:00
Arokha Sieyes
11aded02c7 VR specific changes for previous commit 2017-03-04 01:33:53 -05:00
Arokha Sieyes
7bc26bfc46 Make Cryopod despawn recursive
So mobs being held (teshari, etc) are handled properly rather than simply deleted and not removed from the datacore, having their job slots occupied forever.
2017-03-04 01:33:29 -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