Commit Graph

3089 Commits

Author SHA1 Message Date
Jordan Brown
f0b26dd87b Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2
Actually fixes broken accesses
2018-02-11 16:47:48 -05:00
Jordan Brown
e8801ecf7e Merge pull request #35509 from DaxDupont/too-much-assblast
Removes duplicate air alarm on meta.
2018-02-11 12:35:32 -05:00
MoreRobustThanYou
53422e4088 Adds a SCP-294 ruin (#35188)
* Add a SCP-294 ruin

* Convert map to TGM

* Add hostile mobs, random traps

* Add nanites

* Now now, we don't wanna blow ourselves up, do we, Jimmy?

* Blacklist blob chems

* make it harder

* Remove statue; use can_synth; name finder

* Fixup scp_294.dmm

* Fix traps

* Fix traps

* Add to POI list

* TGM-ize

* ruin remap

* damn tags

* Re-add mimics and traps

* New sprites by @militaires!

* Fix trap spawners spawning ctf protection thingys

* map fixes

* New sprite!
2018-02-10 18:39:27 -05:00
ShizCalev
a5a39ba42b Actually fixes broken accesses 2018-02-10 17:21:03 -05:00
Dax Dupont
23af000dfa Removes duplicate air alarm 2018-02-10 17:15:58 +01:00
Jordan Brown
ca3976fc1d Merge pull request #35435 from optimumtact/mrtyhasahorsecunt
Revert "Adds the saltmine shuttle. (#35369)"
2018-02-09 00:03:36 -05:00
MMMiracles
d72c564191 adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168)
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
2018-02-07 21:23:13 -05:00
oranges
b1f301b39b Revert "Adds the saltmine shuttle. (#35369)"
This reverts commit c7ee29b5b0.
2018-02-08 01:49:57 +00:00
ShizCalev
dc862ad931 Var cleanup and map fixes 2018-02-07 17:10:22 -05:00
Dax Dupont
c7ee29b5b0 Adds the saltmine shuttle. (#35369)
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
2018-02-07 15:16:54 +02:00
Mark9013100
9cb814a6b7 Fixes Delta Whiteship being unpilotable (#35343) 2018-02-06 03:55:40 -05:00
Tad Hardesty
c33e32ac22 Fix bloodpack-related Travis failures (#35375) 2018-02-06 00:48:39 -05:00
Tad Hardesty
b3805134c4 Fix caravan ambush ships being unpilotable (#35341) 2018-02-06 00:30:36 -05:00
nicbn
9348ad9aad Fixes bloodpack sprite issues (#35288)
* Fixes bloodpacks with question marks

* .

* .

* .
2018-02-05 20:21:13 -05:00
vuonojenmustaturska
c4fd8715a5 Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#35291)
* Ore Stacking

* honk

* honk

* component memes

* honk2

* fix overlay off-by-1, sheet singular names

* Give the ores more descriptive names since sheets also have

* whoops debug memes

* atom editor memes

* fixes

* snowdin fix
2018-02-05 22:27:35 +01:00
Dax Dupont
b94148b330 Fixes crematorium on meta/box. (#35305) 2018-02-05 15:00:35 -02:00
MMMiracles
6c2db52ab3 Snowdin 2.0 (#35000)
* wrah wah wah waaaah

* fences, new mountain turfs, sprites, top-side finished, misc stuff

* quick fix

* cut my life into pieces, this is my last resort

* lots of work done to the underground segment, more fluff bits and topside work

* removing depreciated bits and tgm conversion

* step_off

* damn these dirty VARS

* changes n stuff

* wanna build a plasmaman?

* decals commit fix

* map detailing, loot spawns, plasma miners, cyberboss changes, plasma lava turning people into plasmamen

* tgm conversion

* new barricade sprites, final map edits before testing

* mountain wall fix

* Update snow_storm.dm

i ate too mucha pasta
2018-02-05 17:09:34 +02:00
Tad Hardesty
e613e03a94 Mark pirate ship docking port non-timid (#35090) 2018-02-04 13:38:14 +01:00
Slignerd
f5046f86ec Moves the spare ID inside the captain's locker (#35219)
* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)
2018-02-04 02:01:33 -06:00
ShizCalev
b079155961 Readds the syndicate comms officer (#35193) 2018-02-04 01:57:42 -06:00
ShizCalev
5715f5625d Fixes some broken accesses (#35234) 2018-02-04 01:48:51 -06:00
ShizCalev
34897d8709 Removed tripAI landmark (#35256) 2018-02-04 01:13:40 -05:00
Ashe Higgs
42cae05d14 Moves the circ. lab firelock down a tile (#35217) 2018-02-03 14:12:55 -05:00
Jalleo
a256acf330 Lava map slights (#35201)
* Updates a few maps a tad on lavaland

* Adds two freezers to syndicate lavaland for some chefing
2018-02-03 13:57:01 -05:00
Dax Dupont
cd7169d88d Makes departemental lathes easier to access. (#35224)
* Test

* should work now
2018-02-03 13:54:53 -05:00
ShizCalev
b1ed8d0dc8 blasts away a double stacked blast door in atmosia 2018-02-01 03:04:21 -06:00
Jalleo
7ee0dc0ceb Removes ghost spawner from Syndicate listening ruin (#35083)
* Does what Kor says

* Other part of the fix if Kor wants it

* Does what KorPhearon wants
2018-01-31 17:01:31 -05:00
ShizCalev
f3955eaaf4 Corrects space tiles on Abandoned Teleporter 2018-01-31 09:05:03 -06:00
Jittai
2db9ecbaa6 Morgue and Crematorium Repositions (#35113)
* Morgue and Crematorium Reposition

* Chapel Tweaks

* Fix generated instances

* hm
2018-01-31 03:20:31 -05:00
81Denton
0818a251fa Adds missing GPS signal to caravan ambush ruin (#35114) 2018-01-31 02:52:14 -05:00
Tad Hardesty
79f208482e Move the whiteship dock to a space ruin (#35128) 2018-01-31 02:51:43 -05:00
vuonojenmustaturska
e0574d3202 Merge pull request #34925 from ShizCalev/message-server-fix
Fixes messaging server runtime
2018-01-30 17:01:56 +02:00
Cruix
f76b3e3b29 Added map generation lava protection to the syndicate lava base (#34764)
* Added mapping helper for preventing lava river generation

* Added lava protection to the syndicate base bridge

* Re-added decals to the syndicate lava base bridge
2018-01-29 11:02:33 +01:00
Jordan Brown
4168cf0834 Merge pull request #35046 from WJohn/ferry_fix
Fixes the ferry shuttle on central command.
2018-01-28 23:27:35 -05:00
Jordan Brown
f0bc53d219 Merge pull request #34926 from ShizCalev/morguetray-revenant
Makes revenants spawn on dead bodies & bodycontainers
2018-01-28 19:03:14 -05:00
ShizCalev
d11f6b57b8 Fixes bad APC name on Boxstation 2018-01-28 15:43:47 -05:00
FrozenGuy5
e645319e6b Changes up the Construction Area on Box slightly. (#35009)
* Moves an APC in the construction area

* Adds a vent too and fixes the APC name

* fixes APC

* oranges' head is on fire, please send help contributers
2018-01-28 15:33:32 -05:00
WJohn
7a943f879b Fixes the ferry shuttle on central command. 2018-01-28 00:35:59 -05:00
Jalleo
8832d96a54 Same with the SPACE_IS_SMALLER but only with smaller maps (#34984) 2018-01-27 19:36:33 -05:00
FrozenGuy5
249bb6b61e mapmerge2 on lots of maps (#35023)
* mapmerge2 on lots of maps

* removes da colon
2018-01-27 19:33:06 -05:00
WJohn
5ff8734161 Reduces the amount of bombs on the lavaland syndie base from 28 to 9. 2018-01-27 07:57:55 -06:00
ShizCalev
25149f988c Deprecates landmark, spawns off bodies and trays 2018-01-26 12:59:00 -05:00
Jalleo
0a2345a1d4 Shrinks template maps (#34935)
* OH GOD HOW DID THE MAPS GET SMALLER?

* How did that happen?

* Removes one more row
2018-01-26 09:46:18 -05:00
Jordan Brown
fb1868d102 Merge pull request #34919 from AutomaticFrenzy/patch/listeningpost-medicine
Change medicine closet on Listening Post to Syndicate access
2018-01-25 22:41:53 -05:00
coiax
8e20aa3f7b Refactors shuttles to be loaded in, rather than be on the station maps (#33766)
* Refactors shuttles to be loaded in, rather than be on the station maps

- Shuttles are now loaded in by the shuttle subsystem.

You configure what shuttles are loaded in via
`/obj/configuration/shuttle_load` objects.

* Box arrivals shuttle is now imported from template

* Moves things out of the #ifdef

* Box emergency shuttle is now imported

* Box emergency shuttle is now templated

* Box ferry and whiteship now load from template

* More shuttles on Box done

* Apart from the pods, Box is now completely templated

* Delta now has all non-awkward shuttles loaded in

And Centcom..

* Removes no ops turfs, more error messages

* Fixes slightly chopped off external wall

* Massaging more shuttles into working correctly

* Debug messages are king

* Delta cargo shuttle now docks again

* First pass of Metastation shuttles

* Omegastation first pass

* Metastation now has its own shuttle

* Did most shuttles on Pubby

* Turns out Pubby arrival shuttle is slightly smaller than Box arrival

* Whoops, missed a stationary port

* TGMified the pubby arrival shuttle

* First pass, box is working

* All stations now have roundstart_template and no configuration objects

* Removes roundstart_move

* Why do we even have these unused keys

* Remove unused coded vars

* removes some excessive safety checks

* Missed some Centcom cargo dock stuff

* Got it working again

* That thing that Cyberboss wanted

* Noop turfs the shuttle templates

* And template noop for the area

* Attempts to assuage travis

* Warning!

* Please love me, Travis

* RIP Remie
2018-01-25 15:18:15 -05:00
ShizCalev
1f4d4d155c Fixes messaging server runtime 2018-01-25 02:10:18 -05:00
Tad Hardesty
188f78dac0 Change medicine closet on Listening Post to Syndicate access 2018-01-24 18:42:07 -08:00
Jordan Brown
49333a11aa Merge pull request #34623 from ninjanomnom/template-placeontop
Makes templates able to use PlaceOnTop
2018-01-24 19:18:19 -05:00
Jordan Brown
d6a9dd77a7 Merge pull request #34841 from ShizCalev/derelict-fix
Fixes derelict area issues
2018-01-24 19:09:05 -05:00
MMMiracles
252a7e37a7 baseturf editors on syndicate base (#34815) 2018-01-24 16:43:19 -05:00