Commit Graph

324 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
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
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
ShizCalev
dc862ad931 Var cleanup and map fixes 2018-02-07 17:10:22 -05:00
Tad Hardesty
b3805134c4 Fix caravan ambush ships being unpilotable (#35341) 2018-02-06 00:30:36 -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
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
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
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
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
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
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
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
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
ShizCalev
7118da887b Fixes derelict area issues 2018-01-23 17:21:01 -05:00
ninjanomnom
3e8271c77b removes ruin baseturf helpers for lavaland surface
and fixes related issues
2018-01-23 10:00:02 -05:00
vuonojenmustaturska
6406896df1 Replaces a bunch of obj vars (and emagged on machinery/items) with obj_flags (#34078)
* It works, but is it worth it?

* bitfield helpers take 1

* Would this work?

* remove dangling debug code

* rebase & fixes

* vv bitfield stuff, reading

* DNM oceans of shitcode DNM

* honk

* honk2

* plonk

* rebase & fix
2018-01-22 20:19:46 +01:00
WJohn
8a25a614b8 Tweaks space syndie listening post and lava syndie base. (#34718)
* Tweaks space syndie listening post and lava syndie base.

* Replaces sleeper with medicine locker.

* Gives the syndicate fighter pods and the drop ship the ability to dock at the listening post.

* whoops blacklist

* Removes syndicate access requirements on pirate bridge blast door button.

* Places the airlocks above the firelocks on listening and caravan.

* this kills the dirty vars

* the skill that cuts the DIR and LISTENING vars
2018-01-22 14:05:34 -05:00
WJohn
fecaab87e9 Remaps the syndicate ambush space ruin. (#34621)
* Remaps the syndicate ambush space ruin completely.

* conflict fixes

* changes station_lock_override vars to lock_override

* banging donk
2018-01-20 23:02:03 -05:00
Jordan Brown
6732e5c843 Merge pull request #34576 from coiax/removes-teleport-beacon-from-golem-ship
Removes teleport beacon from Free Golem Ship
2018-01-19 09:49:59 -05:00
ShizCalev
db8743277f Cleans up stacked turfs 2018-01-18 22:20:23 -05:00
ShizCalev
9cb4772b61 Sign restructure (#34527) 2018-01-18 21:15:02 -05:00
ShizCalev
81afde8700 Fixes irreparable plating (#34472) 2018-01-18 21:12:46 -05:00
Jack Edge
21dea37ac4 Removes teleport beacon from Free Golem Ship
🆑 coiax
del: The Free Golem Ship no longer has a teleport beacon.
del: Jaunters no longer have a special effect when teleporting golems.
/🆑

Originally, when I changed the golem equipment vendor to just have all
regular items + some special ones, people were concerned that golems
would use jaunters to get back to the station, so I put a teleport
beacon in the ship, and made jaunters send golems to that beacon.

But in practice, now, golems don't try to leave for the station;
instead, you just have people teleporting to the ship for the loot, then
hand teleporting out.

It also telegraphs the golem's presence, lessening the surprise of
miners when they run into them in the wastes.

I talked to Kor about this, and he says it's fine.
2018-01-18 12:29:41 +00:00
oranges
387e09c08f Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-17 09:36:15 +13:00
uraniummeltdown
8d5030f3a7 rename all 'clown' to 'bananium' for bananium mineral objects (#34462) 2018-01-15 23:02:18 -05:00
WJohn
fec56e4923 Remakes the space syndicate listening post. (#34309)
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
2018-01-15 14:17:04 +01:00
oranges
30ea4d1a38 Merge pull request #34161 from ShizCalev/bot_sssembly
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 23:21:58 +13:00
ShizCalev
cdb53fcbe9 Fails travis on common mapping mistakes 2018-01-11 13:36:06 -05:00
WJohn
28bc6b4179 Fixes a few more issues with the syndie lavaland base. (#34143)
* Fixes a few more issues with the syndie lavaland base.

* Prevents potential monkey infighting derp.

* Fixes air pump and mixer in atmos.

* Misc fixes and tweaks.

* Whoops monkey.

* Prevents possible exploit relating to nuke op ship.

* Whoops forgot shuttle ID.
2018-01-07 19:45:16 -05:00
ShizCalev
c4496dbd72 Consolidates bot assemblies under one parent 2018-01-07 13:43:46 -05:00
WJohn
5dae040638 Fixes lavaland syndie base leading to space upon self destruct. (#33995)
* Fixes lavaland syndie base leading to space upon self destruct.

* Fixes another issue

* reee get out dirty var
2018-01-01 22:49:38 -05:00
WJohn
28c42f6b03 Redesigns the syndicate lavaland base. (#33962)
* Redesigns the syndicate lavaland base.

* Adds a couple of lights to airlocks.

* Makes external walkway's area unsafe during ash storms.

* Changes areas to /unpowered

* Minor fixes to lightbulbs, bar sign access, and air alarms having 152 when they should have been 150.

* Changes pump to /on subtype and removes unecessary null inupt tags.

* Removes a ton of dirty vars.

* More cleanup.

* I think that's the last of them.

* Removes icon states that shiz requested.

* Moves RPD and adds an empty canister in atmos.
2017-12-31 18:57:15 -05:00
Emmett Gaines
4595c46dca turns the baseturf var into a part time list (#33705) 2017-12-25 20:10:08 -05:00
uraniummeltdown
984406c1e5 Glass Airlocks Made Into Subtypes (#33764)
* move door_assembly types to new door_assembly_types.dm
fixed some stupid airlock varedits
made glass airlocks a subtype of their solid variant

* examine door assembly to see what name is set
move airlock emagged description to examine()
2017-12-25 17:50:03 -05:00
ShizCalev
2243d85981 Corrects crashedship diags 2017-12-20 13:23:39 -05:00
ShizCalev
d79d92e1ae Standardizes deconversion message (#33547)
* Standardizes deconversion message

* More cleanup

* Reverted tooltips

* Standardized all flavour_texts

* Cleaned up redundant classes
2017-12-17 12:49:42 +13:00
Armhulen
93e9f16c3d Mi-go (#33050)
* !ONE COMMIT PR!

* not one commit pr :(

* fuck wait

* speak emotes, claw attacks

* netherworld link!

* final fixes

* spells, and portals

* grammar

* fixed nether link, more mi-go sounds

* no more shitspells

* final touches

* HALF DONE

* fuck load of changes jesus

* i said TAKE THIS

* FULL DONE

* OK, shiz, take this!

* yea

* i'm actually gonna vomit

* fixes hopefully the last

* fuck

* fixes

* nice :)

* woop

* fantasmifc

* i get it :)
2017-12-16 15:19:27 -05:00
uraniummeltdown
09be3e9b6b Airlock Construction Update (#33152)
* removed typetext and icontext vars from door assemblies, airlock painter no longer works on door assemblies
removed 'anchored = TRUE, state = 1' copypasta from door assemblies
door assemblies update their name more regularly during construction
added new airlock types to airlock painter on airlocks, and to the RCD
airlock assemblies built with metal are now in a list, you can build many more airlocks
vault door assemblies can be built with 4 plasteel
added a solid version of station2 airlocks, renamed to "public airlock"
glass and mineral sheets are now able to be welded out of door assemblies

* find n replace airlock/glass to airlock/glass_public in maps
door_assembly_glass to door_assembly_public

* made highsec airlocks built with 6 plasteel, removed from RCD and airlock painter
vault doors built with 8 plasteel
removed redundant vars in airlock_types.dm
reverts the dumb rglass 'replacement' addition in door assembly construction

* moved airlock assembly defines to construction defines file
fixed incorrectly named shuttle airlock glass_closed and maint panel protected closed overlays
improved examination message for glass/minerals present in assembly

* airlocks take their dir from the assembly when built from assembly
removed "vertical" variant of survival pod airlock, unneeded
survival pod airlock assembly can have glass applied
solid and glass overlays for survival pod airlocks

* OOPs some airlocks, removes a duplicate door assembly, removes some var edits on maps for a new glass type

* turn copied door assembly code into a proc
some feedback during door assembly construction
door assembly created airlock takes name from base_name if no custom name
moved plasma airlock proc to airlock_types.dm
2017-12-10 22:23:43 +01:00
ACCount
1c63327c0a Removes juicers (#33361)
* Removes juicer

* Of course there's THAT ONE MAP
2017-12-08 10:33:15 -05:00
kevinz000
5182128d2a refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249) 2017-12-04 10:33:01 +13:00
Kyle Spier-Swenson
8c4885cf6e Revert "Ore Stacking (#33062)"
This reverts commit 8e1ac5720d.
2017-11-28 22:56:54 -08:00
kevinz000
8e1ac5720d Ore Stacking (#33062) 2017-11-28 21:27:34 -05:00