Commit Graph

4330 Commits

Author SHA1 Message Date
Atermonera
e1fe4d5a5d Merge pull request #5293 from VOREStation/pol-closets
Makes closets/crates like boxes
2018-05-26 15:24:45 -07:00
Atermonera
5957251397 Merge pull request #5280 from Anewbe/poi_tweaks
Merc PoI Tweaks
2018-05-25 10:56:40 -07:00
Arokha Sieyes
f9b409549e Makes closets/crates like boxes
Gives them a 'starts_with' (well, renames the existing one. Someone ported it but never actually applied it anywhere).
2018-05-24 17:26:17 -04:00
Arokha Sieyes
80ffd86b0e Change accessories to use bitflags
Allows accessories to 'block' multiple slots
2018-05-22 15:55:22 -04:00
Anewbe
868570414b Swaps out several PoI mobs and turrets 2018-05-20 18:47:27 -05:00
ThoughtSynapsis
feec485159 Add's a few new POI's and minor fixes to old ones! 2018-05-16 12:53:03 -04:00
drexample
5d73584fa3 Adds the Statue - A hostile mob, that moves only when you don't see it (#5108)
* Statue

* Statue done!

* Testing map removed

* Grammar fix + ignoring creator

* Fixed typos, change range to oview, thanks to Atermonera

* made changes that I missed

* Nightvision handling

* diverse blind messages + requested changes

* Bugfixes, added isSynthetic to bots

* commentaries + PoI

* Finalized POI and statue

* removed misclick
2018-05-14 15:21:04 -07:00
Lorwp
71811ef9e9 Corrects missing manifold and pipe in Distro 2018-05-02 21:24:32 +10:00
Neerti
be73b8c36a for(var/bad_code in world)
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -04:00
Atermonera
debef5a5fe Merge pull request #5204 from Anewbe/disposals_fix
Disposals pipe fix
2018-04-25 12:02:18 -07:00
Anewbe
f96e9daa49 Disposals pipe fix 2018-04-21 18:20:10 -05:00
Arokha Sieyes
f0779da58d Stage 2 tag removal 2018-04-18 17:37:41 -04:00
Arokha Sieyes
78134b2b29 Stage 1 tag removal 2018-04-18 17:33:22 -04:00
Anewbe
900396c25f Search and Rescue spawn with the right kit 2018-04-05 01:05:53 -05:00
Atermonera
cdf794950e Merge pull request #5135 from Woodratt/03302018_bugfixesandadjustments
Map fixes and tweaks
2018-04-02 23:52:20 -07:00
Atermonera
da338cc94d Merge pull request #5134 from Lorwp/pilotfallback
Actually adds adhoc_fallback to pilot headsets
2018-04-02 23:51:41 -07:00
Woodratt
266b25232d Map fixes and tweaks
- Flashers in brig cells now should work, extra floor flash in communal brig to deal with crims.
- Inproper access, SMES rooms.
- Trader start point being dark now fixed.
- Medical Vendor Plus has more advanced burn and trauma kits. Also splints.
- Cell 1 and 2 in the brig can now be accessed by detectives.
- Additional r-walls next to the engine room to help with rads.
- Floor decals in a couple areas.
- RD office now has its telescreen back.
2018-03-31 22:33:11 -07:00
Lorwp
12bf2d1bf7 Actually adds adhoc_fallback to pilot headsets 2018-04-01 15:04:25 +10:00
Neerti
f429a176e4 Adds Map Template Groups
Adds ability to have many different 'versions' of a PoI, yet only having one show up per round.
An example on how to do this is provided with Radio Free Sif (aka DJOutpost).
Just make sure all the different versions have the same 'template_group' value.
2018-03-30 05:34:11 -04:00
Anewbe
92df13c8c1 Merge pull request #5098 from Woodratt/03232018_randomaddsntweaks
Changes to objects random
2018-03-29 12:37:14 -05:00
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072)
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
2018-03-28 12:59:12 -07:00
Atermonera
6adbe5537e Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear
Adds permanent markers
2018-03-28 11:49:10 -07:00
Woodratt
fe28a50574 Changes to objects random
- Fixed the icon_state for 'structure/plushie/carp' and the random first aid kit spawner
- Added a random chance tool spawn for power tools (most of the time it should still just be regular tools)
- Adjusted the spawn rate of medkits, combat medkits should be more rare
- Cash split into its own loot item
- Plushies split into large and small plushies
- All the extra plushie spawns added to the random plushie spawn
- Eightball and conch shell added to toy spawns
- Added spawn points for the large plushies, cash, and the power tools
2018-03-23 23:03:15 -07:00
Leshana
b69ca8dbdd Move pilot helmets from southern_cross to main files, they are used on multiple maps now. 2018-03-20 23:54:42 -04:00
Arokha Sieyes
9292a56201 POLARIS: Silly piloting helmet animation
Bonk helmet on shuttle computer to link. No, it doesn't work if you're off the shuttle, no remote info transfer.
2018-03-20 22:52:49 -04:00
Billy Bangles
05d5d0f7f9 removes crayon boxes from map
you can still order them from cargo though, for all those hungry marines
out there.
2018-03-19 20:25:10 -04:00
BillyBangles
85e377f017 Adds a cursed sword (and other haunted things) (#4931)
* adds cursed sword and 'haunted' object framework.

* fixes back.dmi conflicts

* adds cursed blade ghost pod

as well as fixing some ghost pod oddities

* fixes misc.dm conflicts

* adds cursed sword cave POI

* makes cursed sword use voice mob

as opposed to a brainmob
2018-03-19 11:49:33 -07:00
Serithi
bb66e03f18 I heckin' did a music. As far as i can tell i implemented it properly, testing it out has been finicky as all hell. I figure if i did a goof, the Reddit method of giving the wrong answer first so someone replies with the correct one will work. 2018-03-12 02:46:32 -07:00
Woodratt
98c081722e Munitions/Security Supplypack touchy
- Added, weapons crate for explorers that has bolt action rifles, weapon powercell crate (security access only).
- Touchy of all the munition and security supply pack names so it's easier to tell what crate contains weapons, armor, and or gear.
- Slight adjustment of certain security and weapon crates. Moving some guns out of some crates, splitting some crates up (automatic weapons crate is two crates now) and changing the type of crate stuff comes in.
- Holoplant fix, now properly comes in a crate instead of being shipped without a protective box.
2018-03-11 15:26:32 -07:00
Woodratt
c5bf3bf682 Making Pilot Lockers Exist Again
- Accidentally unmapped the pilot lockers and parachute crate, is fix now
2018-03-07 15:44:37 -08:00
Anewbe
8e6146cf66 Merge pull request #5017 from Woodratt/03052018_firstaidandbugfix
First Aid Addition and Bug Fixes
2018-03-05 21:18:44 -06:00
Atermonera
81e5ea9536 Ater poi3 (#4968)
* Supply Drop POI

* Ration Cache

* BlastMine1

* Supply Drop 2

* Tweaks, package bomb detonators can be re-used

* Changelog

* Missed some spots while cherry-picking

* Merge branch master (I hope this works)

* Appeases travis

* Missed a spot
2018-03-05 19:55:27 -06:00
Woodratt
c4a2d45079 First Aid Addition and Bug Fixes
- Fixed missing wire in AI core
- Readdition of first aid stations without sleepers
- Fixed some wall issues on the centcomm z
- Fixed Cafeteria register
- Minor adjustments to Security first aid station
2018-03-05 17:50:32 -08:00
Woodratt
b4bc071403 Map Bugfixes Miner Additions
- Extra heavy duty charger and battery to the drill staging area
- Getting the mine cave areas in line with what is on the map
- Fix for the doors to the wall to keep the heat in
- Multiple missing air alarms, pipes, and other bits fixed on the station.
- Starboard solars is now port and or vice versa.
- Addition of a washing machine, and sink to medical
2018-03-03 19:13:17 -08:00
Anewbe
c13c1c6ad0 Adjusts PoIs (#4954)
* Adjusts PoIs
2018-03-01 11:57:18 -08:00
Anewbe
65d3a6f199 Merge pull request #4976 from Woodratt/02262018_thenorth
Wilderness Overhaul
2018-02-28 11:18:10 -06:00
BillyBangles
f49b1a9ad2 Adds ice puzzle POIs (#4963)
* adds slippery ice tiles

* adds ice puzzle POIs

also bedrock (impassable) rock, and ice crystals (which use placeholder
graphics for now)
2018-02-27 17:45:47 -08:00
Woodratt
dd7bfd6c43 Wilderness Overhaul
- Heavy rework of the wilderness, minor adjustments to mining and outpost z-levels. To get to the wilderness you now have to travel through the mine z-level to do so, follow the green flagged path through the mine.
  - Shuttles can now land at a site near the entrance to the wilderness. Removal of the mine shuttle landing pad to move it to the wilderness.
  - New addition of warning sign, thanks to Schnayy.
  - Bugfixes for Heist shuttle not going back to raider post, light overlays on shuttle areas, and certain shuttles not leaving behind floor tiles when they should.
2018-02-26 20:10:46 -08:00
Schnayy
8ccf0f7532 AlliCo Hallmark Goods (#4887)
* Adds the gift vendor, AlliCo Hallmark Goods, ran the name by Elgeon beforehand. Is a delightfully gaudy vending machine placed in the locker rooms. The coffee machine was removed and the sweatmax moved to take it's place so the gift vendor is next to the laptop and cigarette vendors. Prices were based off of the SweatMax vendor.

Before: https://i.gyazo.com/0d6758fc8a469fea6e340b5937b95f82.png
After: https://i.gyazo.com/ab21b6ff7ed012786d475b71f1ec180e.png

Vendor will normally dispense:
- Heart box chocolates
- Bouquets
- Cheaper fake bouquets
- Each of the 4 cards previously added.
- All the therapy dolls.

Will dispense the following with a coin:
- All small plushies
- Newly added trinket box.

Will dispense the following when hacked:
- Gilthari Luxury Champagne
- Plans to add a handbuzzer in the future but not right now.

Items & Reagents added:

- Champagne. Is not a mixable reagent, listed as a child of wine.
- Gilthari Luxury Champagne. Contains said reagent.
- Trinket box. Think an engagement ring box, except it can also hold coins and medals. May be toggled open/closed, when opened it's description will say what's inside. Can only hold one item. Thanks to Mechoid for helping me code this mess. https://i.gyazo.com/7a16faada015ef0795a4db2ec6429e68.png
- Also goes in and fixes a small bug with the heart box saying it contains donuts when it does, in fact, not contain donuts.

Side note, mapping things in is scary!!!

* In the process of fixing the map merger nonsense w/ mechoid's help.

* We're almost there lads.

* If this doesn't work I'll cry.

* Changes name to AlliCo Baubles and Confectioneries, fixes conflict (hopefully), and adds friendship bracelets to vendor.

* REVERTING ITEMS.DMI. Attempting to fix conflict.

* Recommitting items.dmi

* One last attempt to fix the conflict before I make some bigger changes to get this through.

* Removed conflicting file and committed out calls on the sprite. Will readd in separate PR.

* now with 20% less silly
2018-02-24 11:01:23 -06:00
Anewbe
a3ce499607 Merge pull request #4924 from VOREStation/vplk-atmos-trinary
Eliminate duplicate code in trinary atmos components
2018-02-23 13:16:37 -06:00
BillyBangles
8f8f692ea0 Makes a dark ritual even darker (#4923)
* makes a dark ritual even darker

* makes the dark ritual maybe not THAT dark

* tweaks rune icon
2018-02-23 13:16:26 -06:00
Leshana
ba36595263 Consolidated digital t-valves type paths.
- Because mirroring is now *much* easier to setup than digital remote control, we reverse the order of inheritance to de-duplicate all the radio code from digital t-valves!
- This requires changing the following type paths:
    /obj/machinery/atmospherics/tvalve/mirrored/digital  -> /obj/machinery/atmospherics/tvalve/digital/mirrored
    /obj/machinery/atmospherics/tvalve/mirrored/digital/bypass -> /obj/machinery/atmospherics/tvalve/digital/mirrored/bypass
- Change made on all maps.

- We can eliminate any overriden methods at all on flipped trinary devices by making a `mirrored` and `tee` variable!  This allows us to do things like flip them without delete/spawning.
- T-Valves are also basically trinary.  Sadly they are not a subtype, so to share code with them I have to put it into an outside proc.  But still worth it.
2018-02-22 15:11:55 -05:00
Anewbe
dfdafddaa9 Merge pull request #4897 from VOREStation/pol-analfix
Fix health analyzer names
2018-02-21 10:03:09 -06:00
Anewbe
db37fc3797 Merge pull request #4891 from ThoughtSynapsis/TSPOI21
POI Bugfixes / Sprucing.
2018-02-21 02:02:55 -06:00
Anewbe
07c970e6e5 Merge pull request #4894 from Woodratt/02202018_vaultpoi
New Cave PoIs
2018-02-21 02:02:28 -06:00
Arokha Sieyes
3fdafb7194 Rename medical scanners and update map 2018-02-20 19:25:31 -05:00
Anewbe
67261d40f3 Adds planetside gun permits (#4879) 2018-02-20 12:37:03 -08:00
Anewbe
25a1f47a30 Headset sprites, planetside headset functionality (#4869) 2018-02-20 12:36:22 -08:00
zaredman
6a641f620e Fixes some tile overlays on z1 (#4886)
* Fixes some tile overlays on z1

* More tile & floor fixes.
2018-02-20 10:36:19 -06:00
Woodratt
dad162659a New Cave PoIs
- Addition of 6 new potential PoIs for the cave z-level.
2018-02-20 00:59:30 -08:00