Commit Graph

3200 Commits

Author SHA1 Message Date
Jordan Brown
b0c31b5d0d Merge pull request #37570 from BuffEngineering/WestSolars
Fixes mapping issue on deltastation
2018-04-30 22:21:27 -04:00
YakumoChen
bea23b6182 Readds BZ Cannisters for Xenobiology (#37481)
* update BoxStation.dmm

Adds BZ to Xeno

* Update DeltaStation2.dmm

adds BZ to Xeno

* Update MetaStation.dmm

Updates Meta's Xeno with BZ

* Update PubbyStation.dmm

Adds BZ to Pubby's Xeno
2018-04-30 02:13:31 -04:00
BuffEngineering
46e1241359 Fixed mapping issue
Connects west solars to main grid on delta.
2018-04-29 21:41:01 -04:00
Emmett Gaines
ee3446eb7c Templates the caravan ambush ruin shuttles (#37474) 2018-04-29 11:07:39 -04:00
oranges
9d58e092cb Merge pull request #37009 from MMMiracles/jookbox
Adds the jukebox to every active map.
2018-04-28 13:20:03 +12:00
Armhulen
ca273db3f0 Removes SCP_294 (#37326)
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
2018-04-26 03:05:41 +12:00
Barhandar
093a5b8a0a Moved middle engine field generators to the side to prevent crosslinking. (#37408) 2018-04-25 10:22:38 -04:00
Fox McCloud
057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00
Dax Dupont
423a5fe3bd Adds disk fridges to meta/box/pubby (#37336) 2018-04-22 20:44:47 -04:00
81Denton
db26ab5d35 Delta ORM position (#37325)
* makes delta ORM accessible

* turf decal
2018-04-22 20:21:35 -04:00
ShizCalev
8e33113cfe Cleans up conveyor belts (#37288)
* Cleans up conveyor belts

* Fixes

* rip that idea. this fixed it anyway at least
2018-04-20 02:52:14 -04:00
Jordan Brown
6b50baa720 Merge pull request #37268 from ShizCalev/scp-ruin-fix
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
2018-04-18 12:33:45 -04:00
81Denton
97d3376f25 Fixes lavaland syndie base rads + SSU compartment issues (#37252)
* radsuit SSU, syndie lava base rad protection

* re-adds missing combat gloves

* defines radsuit SSU name by the obj
2018-04-18 08:01:08 -04:00
ShizCalev
29e927d902 Fixes SCP ruin turret faction 2018-04-17 10:41:43 -04:00
Jordan Brown
2ade25c2d1 Merge pull request #37205 from ninjanomnom/proper-aux-base
Fixes aux base loading
2018-04-15 23:23:27 -04:00
Jordan Brown
7262a3e5cb Merge pull request #37206 from AutomaticFrenzy/patch/pixel-z
Correct some pixel_z issues
2018-04-15 23:22:38 -04:00
ninjanomnom
e9d2265248 Fixes aux base loading 2018-04-15 00:22:03 -04:00
Tad Hardesty
6df32bc38b Correct some pixel_z issues 2018-04-14 20:21:37 -07:00
Denton
08463ae42c removes tinyfans from omega/delta tcomms 2018-04-14 14:38:27 +02:00
ShizCalev
0606fcf417 grunge airlock 2018-04-13 09:05:41 -05:00
Emmett Gaines
b831ab50aa Updates baseturf helpers to the new baseturf system (#37154) 2018-04-13 15:59:01 +03:00
81Denton
91ed3dec6b replaces SM crystal with non-moveable shard (#37124) 2018-04-12 11:56:30 -04:00
Emmett Gaines
7dcd690756 Removes some unnecesary vars on shuttles (#37041)
* Removes some unnecesary vars on shuttles

* Forgot to reapply unused transit turf flag
2018-04-12 13:42:03 +03:00
ShizCalev
6078698f84 Fixes duplicate docking port on aux base template (#37106) 2018-04-11 14:31:05 +02:00
iksyp
910eb893b9 The supermatter crystal is now the parent object of the supermatter shard, rather than the other way around (#37025)
*every mention of /obj/item/machinery/power/supermatter_shard in the code should have been replaced with /obj/item/machinery/power/supermatter_crystal and it's variants.
*supermatter shard has been moved to /obj/item/machinery/power/supermatter_crystal/shard
*variable changes like gasefficiency and explosion_power has been switcharood in order to keep it in line with the game as of now
2018-04-11 22:18:49 +12:00
ShizCalev
e71af8bc87 Fixes Gr3y.T1d3 delaming the SM (#36925)
Fixes #36841
2018-04-11 22:11:49 +12:00
81Denton
a28f2e5cdc FUCKING COMPILE (#37051) 2018-04-10 18:02:06 -04:00
Emmett Gaines
166e001950 Various minor arena shuttle fixes (#37012) 2018-04-09 11:37:22 +02:00
Emmett Gaines
11ba45f708 Makes the pirate ship use a proper shuttle template (#37006) 2018-04-09 11:36:34 +02:00
81Denton
76aeaece4c Gives Omega its own arrivals shuttle (#37043)
* adds arrival shuttle to omega

* anchors closets, removes dv

* moves DS poster 1 tile south
2018-04-09 00:50:25 -04:00
Tad Hardesty
a83e9b36ad Fix errant space area on OmegaStation (#37026) 2018-04-08 05:57:55 -04:00
Robustin
64eff00306 Removes Roundstart Active Turfs (#36756)
* River AT fix

* Roundstart AT fix

* simpler

* Wait simpler is bad

* Webediting

* more weebediting

* Remove ashwalker active turfs

* Swarmer Crash has lavaland atmos

* Removed redundant checks
2018-04-06 10:23:01 -04:00
MMMiracles
19db4941d8 Omegastation Mapping Fixes (#36964)
* various omegastation fixes

* i forgot to actually map in the nerfed sm shard oops

* dirty vars and removing my redundant shard

* anchored = 1
2018-04-06 10:07:18 -04:00
MMMiracles
687a2272b6 adds the jukebox to every map 2018-04-05 20:35:20 -04:00
Emmett Gaines
49d1e9ee66 Shuttles have additional baseturfs, and other minor baseturf changes (#36388)
cl ninjanomnom
fix: Shuttles have proper baseturfs now.
fix: Mineral walls properly use their baseturfs when destroyed/drilled.
add: A new engineering goggle mode allows you to see the shuttle area you're standing in.
admin: Buildmode works a bit better with baseturfs now and can properly only remove the top layer of turfs when editing. Note that as a result the order you place turfs is important and a wall placed on space means when the wall is removed there will be space underneath.
/cl

This adds an area hook for turfs getting the PlaceOnTop proc called so shuttle areas are able to intercept it and add a special turf used for determining where the bottom of the shuttle is. I'm not too certain on this being the best way to handle it but the alternatives restrict the kind of turfs that are allowed to be on shuttles which I didn't want to do as it was part of the whole intent of the baseturf change to allow any turf type on shuttles.

The alternative to the area hook would require a tool which attaches turfs to a shuttle which is why there's a shuttle area viewing tool in this pr. I considered doing it this way first but decided it was too clunky.

In addition to other changes:

Tiled/Reinforced floors have proper baseturfs now.

A large amount of the remaining ChangeTurf calls were swapped over to various baseturf helpers so, for example, mining doesn't create a lavaland turf if somehow the mineral wall is on plating.

Escape pods, the aux base, and syndicate drop pod have been converted over to shuttle templates as well.

The error when the timid var is set incorrectly has been changed to a stack_trace.

The change turf file has been made all lowercase as per standard.
2018-04-05 11:13:20 +12:00
KorPhaeron
447146193a Refactors Dance Machine + deletes a bunch of sound files (#36815)
* Refactors Dance Machine

* Removes sound from netherworld

* Fixes icons

* More fixes

* QDEL_LIST

* Sanity check

* Matches delimiter to README

* qdel_list

* Fixes disco version of machine
2018-04-01 17:42:32 +03:00
vuonojenmustaturska
b411265ab5 Removes stray defines from maps 2018-04-01 16:07:31 +03:00
vuonojenmustaturska
d1d8dbe9e3 Merge pull request #36850 from 81Denton/pubby-bombsite-cams
Pubby: fixes bomb testing site cam networks
2018-04-01 15:26:42 +03:00
81Denton
77b1072d9b [Ready] Atmos cleanup + subtypes (#36690)
* dv cleanup/pump fixes
dv cleanup pubby

* atmos machinery subtypes

* incinerator cleanup after on = FALSE; removes luminosity overrides

* fixes freezer target temp

fixes heater/freezer target temp

* flipped filters, flipped/inverse air mixers

* atmos filters and air mixers

* freezers and heaters

* semicolon

* solves conflicts with #36659, #36673

* fixes pubbystation.dmm merge conflict

* adds icon_state and comments to pumps/mixer/thermomachine

* min/max_temperature comment

* replaces 4500kPa with MAX_OUTPUT_PRESSURE

* handles freezer/on temp in Initialize()
2018-03-31 16:33:21 -04:00
Denton
af6d891b25 fixes camera tags/screen desc+name 2018-03-31 09:15:07 +02:00
Denton
3d364f3897 adds adv magboots to secure storage 2018-03-29 17:40:27 -05:00
vuonojenmustaturska
1540c93aab Merge pull request #36729 from ShizCalev/incinerator-fix
more incinerator fixes
2018-03-28 15:52:18 +03:00
John Ginnane
c3627c2741 Adds guillotine (#36540)
* Add guillotine to the game

Can be found in BoxStation's courtroom. Also added some sounds to the clap emote, which is used during execution

* Made requested changes

* minor typo

* Updated code

* Added crafting recipe and removed from map
2018-03-28 10:41:03 +13:00
Armhulen
5ed2a56ced Refactors Spell and Martial Art Books to use Action Granters! (#36442)
* HE'S DONE IT

LETS GOOOOOOOOOOOOOOOH

* floyd. floyd. he's the floyd. floyd dude yeah yeah yeah yeah FLOYD

* fireball remarks, the other spells.

* YOU MEAN THE CHAOS FLOYDS

* what is a floyd, but a miserable pile of moodlets

* flflflflfoooaooayoyydd FLOYOYODDD DFFRRURURMPPFF

* FLOYDING LIGHTS LIGHTS LIGHTS LIGHTSSS

* GORGE YOUR MOODLETS, EMBRACE YOUR FLOYD

* no more floydposting, i removed the old spellbooks

* aaaaaaaaaaaaaaaaaaah ALL of the remarks added my fucking god

* 10 days to sunday travis.

* last minute fixes

* 1 fix

* 2 fix

* red fix

* martial granters

* MAMA MIA
2018-03-27 20:51:14 +03:00
81Denton
b7d1277ac2 Pubbystation: makes evac location more obvious (#36528)
* oof

* it keeps happening
2018-03-26 22:38:47 -04:00
ShizCalev
ffc225543e more incinerator fixes 2018-03-25 21:28:47 -04:00
Dax Dupont
d55c1d7aad Fixes omega detective office + prepare_maps change (#36691)
* Fixes Omega Detectives office

* Mentions mapmerge isntead of run map merge
2018-03-25 16:52:14 -04:00
ShizCalev
6cfb86946c Fixes broken omega incinerator doors 2018-03-24 22:03:44 -05:00
81Denton
83c4bde9ec Plastic flaps are now airtight (#36659)
* flaps

* fucking flaps, how do they work?
2018-03-24 22:01:31 -05:00
ShizCalev
03431ab173 Fixes omega power, fixes various atmosia issues, cleans up dirty camera vars (#36545)
cl ShizCalev
fix: Fixed a large number of missing APCs on Omegastation
fix: Fixed unpowered Incinerator outlet injector on Omegastation.
fix: Replaced glass window at Omegastation's incinerator with a plasma window.
fix: Fixes broken atmos injectors on Omega
fix: Fixes broken air outlet on Meta
fix: Fixed a couple of malfunctioning atmospheric monitors across the rest of the maps
add: New test atmos monitoring console debug verb to help alleviate future issues.
/cl

Added a ton of missing APCs and cleaned up some dirty camera name varedits.
2018-03-24 15:16:26 +13:00