Commit Graph

28366 Commits

Author SHA1 Message Date
Mechoid
18e91702d2 Keys now actually exist again. 2018-09-24 13:21:38 -07:00
Atermonera
b8314c336c Merge pull request #5593 from Anewbe/machine_tweaks
Tweaks emitters and Pacman
2018-09-24 11:02:11 -07:00
Mechoid
b7231dc8cc Don't spawn things in Null please. 2018-09-23 00:24:34 -07:00
Mechoid
b3f40308ca Adds some Holy drinks, and Promethean-safe drinks / acclimators. (#5574)
* Adds some Holy drinks, and Promethean-safe drinks / acclimators.

* Carbon + Water + Oil = Sludge

* TRUEFALSE & * removed
2018-09-22 18:53:55 -05:00
Wickedtemp
21878523b1 Adds the Biopsy Scanner to the Surgery Kit (#5589)
* Adds the Biopsy Scanner to the Surgery Kit

Since it's actually used in a surgical operation, it should proooobably be in the kit. Iunno if the kit is really used here aside from antag shuttles, but they might as well have it.

* Added a missing comma

Missed a comma, might be what's causing issues. Iunno. It worked flawlessly in dream-maker.
2018-09-22 18:53:36 -05:00
Anewbe
a942e145b6 Tweaks emitters and Pacman 2018-09-22 18:45:57 -05:00
Atermonera
46f151745f Merge pull request #5581 from Anewbe/mining_toys
Technically adds the Ore Redemption Machine
2018-09-22 13:38:10 -07:00
Atermonera
b07144a7c8 Merge pull request #5587 from Anewbe/wind
Wind in storms slightly nerfed
2018-09-22 12:10:33 -07:00
Anewbe
a31813145f Psychiatric Medication Fix (#5588)
* Psychiatric medications are faster when ingested

* Psychiatric med fix
2018-09-22 12:08:20 -07:00
Atermonera
6289e91239 Merge pull request #5586 from Anewbe/height
Descriptors now properly respect species differences
2018-09-22 12:07:43 -07:00
Anewbe
c75741545a Descriptors now properly respect species differences 2018-09-20 19:30:25 -05:00
Anewbe
6e4a77f010 Boot knives fit in boots 2018-09-19 15:42:08 -05:00
Neerti
aec83fd4f2 Merge pull request #5577 from Anewbe/grilles
Fixes a couple of tool related oversight/runtimes
2018-09-19 16:08:37 -04:00
Neerti
bc331befd9 Merge pull request #5576 from Anewbe/dermal_implant_fix
Dermal implant doesn't cover hair
2018-09-19 16:08:28 -04:00
Neerti
b17b2f63ce Merge pull request #5578 from Anewbe/cuffs
Fixes hand and leg cuffs
2018-09-19 16:08:11 -04:00
Anewbe
3d4bed20c2 Merge pull request #5548 from Poojawa/pls-stop-moosic
Ports /vg/ instrument frame work, adds client based sound pref toggle.
2018-09-19 15:04:06 -05:00
Anewbe
d5979ec960 Merge pull request #5575 from Woodratt/09172018_spacesuitmess
Rig and Spacesuit additions
2018-09-19 15:00:30 -05:00
Woodratt
5a312e14d1 Update combat.dm 2018-09-19 12:11:11 -07:00
Anewbe
c35b99e315 Technically adds the Ore Redemption Machine 2018-09-19 02:04:10 -05:00
Anewbe
5fb0e06a5a Fixes hand and leg cuffs 2018-09-18 14:32:54 -05:00
Anewbe
765106986d Fixes a couple of tool related oversight/runtimes 2018-09-18 14:00:43 -05:00
Anewbe
596e51da42 Dermal implant doesn't cover hair 2018-09-18 13:15:51 -05:00
Atermonera
c8dc627af4 Merge pull request #5573 from Mechoid/Blob2_Revenge_Of_The_Blob
More Blob modularity / Event-Manager compatability, Nests.
2018-09-18 11:11:51 -07:00
Woodratt
9f24c4eba2 Rig and Spacesuit additions
- Added the 'military' Rigsuit from Bay.
- Added 'pmc' rigsuits
- Added exploration and pilot voidsuits along with alternate sprites (alternate sprites done by Naidh)
- Addition of suit cyclers for exploration and pilot voidsuits

None of these suits are currently accessible in game outside of admin bus. Currently only the pilot voidsuits have other species sprites. Exploration suits are missing sprites for Teshari (Naidh made some for their alternates but I have to add them) and the rig suits are human only. This is to be fixed in the near future, just wanted to get the make workload actually in the game first.
2018-09-18 00:35:06 -07:00
Atermonera
f2ac15be91 Merge pull request #5511 from Anewbe/descriptors
Ports character physical descriptors from Bay
2018-09-17 11:21:28 -07:00
Atermonera
ee95a53d98 Merge pull request #5563 from Mechoid/We_are_going_to_Cyber_Space
Cybersuit is now a space rig.
2018-09-17 11:17:49 -07:00
Atermonera
77ef274b98 Merge pull request #5553 from Mechoid/VroomVroom
Vehicle Expansion 1: Zoom Harder
2018-09-17 11:14:54 -07:00
Mechoid
4fb5455fd3 Makes Blobs more useful. 2018-09-16 22:12:17 -07:00
Anewbe
17a5010f44 Signal pistol can be reloaded (#5566) 2018-09-16 17:23:39 -07:00
Anewbe
c12d7e25b0 Readds size traits 2018-09-13 17:22:11 -05:00
Anewbe
8094bbd746 Merge pull request #5564 from Woodratt/09112018_Mapbugfix
Map Bugfixes
2018-09-12 21:03:37 -05:00
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549)
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
2018-09-12 20:51:32 -05:00
Neerti
3c4bb873eb Fixes Lead Walls (#5562)
A material's ``radiation_resistance`` was never considered for calculating a wall's cached resistance to radiation. This fixes it. There is another issue involving r-walls not being better at stopping radiation than their normal-wall counterparts made of the same material but fixing that involves a lot of number adjusting to avoid the SM engine from getting twice as protective.
2018-09-12 18:47:27 -07:00
Woodratt
ea200b8318 Map Bugfixes
-	Fix for mislabeled c_tag cameras, first deck
-	Fix for mislabeled c_tag cameras, second deck
-	Fix for poi crashed containment shuttle mapping issues (terrain generation)
-	Fixed wrong floor type on skipjack
-	Fix for scrubbers pipe, central substation
-	Fix for air supply pipe, chapel
-	Fixed scrubber pipe, Engineering Drone Fab
-	Fix for air supply pipe, Prison Wing
-	Removed redundant supply and scrubber pipe, Security Auxiliary Dock
-	Fix, Fore Aux Dock airlock pipe.
-	Fix air supply pipe, library
-	Fix, scrubber pipe, coffee shop
-	Pipe fix, Medical maint
-	Fix, supply pipe medical secondary storage
-	Removal, redundant supply pipe, cargo maint
-	Fix, virology scrubbers pipes
-	Fix Xenobio and Xenoflora missing atmos connection to the main outpost
-	Fix, missing atmos connections between Main outpost telecoms and main outpost atmos
-	Fix for missing power wires, HoS Office, Warden Office, Heads of Staff Meeting Room
-	New, random mouse spawner
-	New, random mouse spawners added throughout maintenance on the station (maybe too many, maus station 13)
-	New, 30 sheets of lead added to engineering
-	Fix, POIs should now be rad protected and characters won’t be affected by the radiation event
2018-09-11 21:39:46 -07:00
Mechoid
426d4b45f3 The cybersuit is now a space suit. 2018-09-11 19:59:00 -07:00
atermonera
b5f43bf1e4 Emags have an effect on cargo consoles 2018-09-10 13:38:53 -07:00
atermonera
7d580543b7 supplycom/control drops the correct circuit 2018-09-10 13:15:06 -07:00
Neerti
74f70c940b Merge pull request #5522 from Atermonera/PDA_comms2
Implements commcards (Communicator cartridges)
2018-09-09 03:06:21 -04:00
Mechoid
0651206a51 Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike! 2018-09-08 23:05:08 -07:00
Atermonera
40a8a9ba15 Merge pull request #5550 from Anewbe/helmet_hair
Helmets now show only certain hairstyles
2018-09-08 11:02:20 -07:00
Cerebulon
d2cf9c7203 Adds new set of cyborg sprites for medical/science/default/security/combat (#5546) 2018-09-08 11:01:35 -07:00
Atermonera
953221d5b0 Merge pull request #5514 from TravellingMerchant/master
Removes Shellguard Noble cyborg sprites.
2018-09-06 17:52:00 -07:00
Anewbe
f452e66934 Scrubbers no longer automatically scrub phoron (#5512) 2018-09-06 15:51:58 -07:00
Poojawa
5d0328d0e5 fixes the trailing tag, I think 2018-09-05 21:42:27 -05:00
Anewbe
b109cfae42 Helmets now show only certain hairstyles 2018-09-05 19:43:24 -05:00
Neerti
a30a235de5 Merge pull request #5545 from Anewbe/another_boxfort_falls
Buffs the Vox
2018-09-05 15:55:29 -04:00
Poojawa
6b403022a7 Ports /vg/ instrument frame work, adds client based sound pref
Also shifts sound files which is 98% of the bulk here.
2018-09-05 03:35:34 -05:00
Anewbe
4cebe1cfb9 Merge pull request #5541 from Atermonera/rotate_submap
Submaps can be rotated
2018-09-04 22:41:19 -05:00
Anewbe
8c5562b4bc Fixes some bugs tangentially related to Vox code 2018-09-04 21:36:12 -05:00
Atermonera
6acab6f2bb Merge pull request #5544 from Anewbe/grilles
Should fix another runtime with tools
2018-09-02 21:14:02 -07:00