Commit Graph

2374 Commits

Author SHA1 Message Date
ShizCalev f43c9469d6 Minor map fixes 2018-01-17 20:47:54 -06:00
Ashe Higgs a877b9022a adds cameras to runtimestation (#34506) 2018-01-17 08:08:26 -05:00
arsserpentarium d35f3da470 [READY]Circuitry lab (#34493)
* spelling

* base

* maps

* merge

* firealarm

* floor

* floor again

* if you insist...

* DV

* DV(2)

* DV(3)

* fuck

* fuck

* apc

* boxapc
2018-01-16 17:44:26 -05:00
Jordan Brown 05860e2cda Merge pull request #34502 from AutomaticFrenzy/patch/runtime-decal
Update Space Station 13 decal on RuntimeStation
2018-01-16 15:46:08 -05: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
Tad Hardesty 829f264bbe Update Space Station 13 decal on RuntimeStation 2018-01-15 18:21:41 -08:00
theo2003 384708abd0 Moved public autolathes to be accesible from within R&D via windoor. (#34190)
* moved public autolathes to be accessible from within R&D via windoors

* Tweaks
2018-01-15 15:21:41 -05:00
Emmett Gaines 867a58d576 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 09:42:14 -05: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
oranges 31918d1dec Merge pull request #34101 from ShizCalev/got-a-light-
Removes omnizine (traitor) cigarettes from captain's office on Meta
2018-01-12 09:04:12 +13:00
ShizCalev cdb53fcbe9 Fails travis on common mapping mistakes 2018-01-11 13:36:06 -05:00
modularized_suicide 65bfae057b aaaaaand quick map fix. should be done 2018-01-08 08:40:57 -05:00
ShizCalev c4496dbd72 Consolidates bot assemblies under one parent 2018-01-07 13:43:46 -05:00
ShizCalev 2fd6310c47 Fixes meta toxins lab (#34087) 2018-01-05 07:00:11 -05:00
Okand37 8926a7d64c Omegastation Updates and Fixes (#34070)
* Updated satellite and objective items

* Fixes
2018-01-04 20:13:31 -05:00
ShizCalev 32da768ca3 Removes omnizine cigarettes from captain's office 2018-01-04 16:24:56 -05:00
Okand37 0adeb89a36 Omegastation Updates & Fixes (#33980)
* Updated Omega with lots of stuff!

* Cleanup
2018-01-01 22:45:18 -05:00
vuonojenmustaturska 16e0e5f0ae Improves loot drop spawners, adds AI law spawners to cores (#33945)
* hymn to breaking strain

* remove subtypes as requested

* no-one saw that
2017-12-31 03:26:43 -05:00
Jordan Brown 5f613eaed9 Removes chemist job from omegastation (#33863)
* Removes chemist job from omegastation

* Remove chemist start points
2017-12-30 17:04:11 -05:00
ShizCalev 72020d9ceb Fixes meta service wall and box cargo marking 2017-12-29 15:48:37 -05:00
Dax Dupont 7ed96f12b9 Unblocks things on the walls in medbay and also removes an additional Radiation Collector (#33906)
* Unblocks things on the walls

* Fucking mapmaker

* Fixes radiation collector

* Rewires apc oh god i am a moron

* Removes dirty vars
2017-12-29 14:40:35 -05:00
coiax 441443f6ae DeltaStation now has xmastree spawn landmarks (#33872)
🆑 coiax
add: Deltastation now has christmas trees during seasonally appropriate
times.
/🆑
2017-12-26 21:10:58 -05:00
Tad Hardesty b57d15aac8 Improve parts of CentCom's appearance slightly (#33832)
- Fixed missing icon_states on indestructible windows, so they appear
  properly in the editor.
- Increased the symmetry of the Syndicate Infiltrator's areas.
- Pointed a few more computers in the correct direction.
- Removed unused keys so future changes will go more smoothly.
2017-12-26 14:50:20 -05:00
Emmett Gaines 8fdf0c508f Arena shuttle teleport fix (#33777) 2017-12-25 20:11:40 -05:00
Ashe Higgs c4a495929c Locks up Medical Storage a bit more tightly and adds framework for doors to ignore access reqs during red alert (#33686)
* Locks up the first aid kits

* = FALSE
2017-12-25 20:04:33 -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
WJohn 26ef6760e7 Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731) 2017-12-22 11:34:24 -05:00
awesine 727c0d1450 adds mining scanners to the gulag (#33711)
* Add files via upload

* Add files via upload
2017-12-22 14:23:04 +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
Jordan Brown 15a2867373 Merge pull request #33450 from ShizCalev/sec-lockers
Adds security departmental lockers to Box & Pubby
2017-12-12 13:59:26 -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
ShizCalev c6b09bda22 Adds security departmental lockers 2017-12-10 16:20:12 -05:00
Cruix 05d7402bad Allowed shuttle docking ports to be hidden from some shuttle docking computers (#33148)
Added a delay to the white ship shuttle docking computer designating a landing spot
2017-12-11 09:22:48 +13:00
Tad Hardesty be245c6302 Cycle-link airlocks in the mining base (#33095) 2017-12-09 02:52:31 -05:00
coiax 2b49bb79f9 [Box] Moves drone dispenser to Robotics maintenance (#33342)
🆑 coiax
add: The drone dispenser on Box Station has been moved from the Testing
Lab to the Morgue/Robotics maintenance tunnel.
/🆑

- I added a 2 drop maint loot spawner as well.
2017-12-07 13:36:09 -05:00
Ashe Higgs 32c68a60bf Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more (#32935)
* Adds the Eminence

* New abilities and a command system

* More stuff

* I did something in this commit but I dunno what

* Beginning work on trap setups

* This is good for now until arm gets his sprites

* I did something here!

* Manacle sprites

* R.I.P. R&D

* Maintainer review

* QoL, slabbin' it up

* Conflicts

* Conflicts

* <

* Now it compiles!

* TGUI

* TGUI, again

* 🥝

* that should be all, but I'll do some quick testing...

* aha!
2017-12-07 11:36:26 +13:00
coiax d784e2d235 [Metastation] Moves drone dispenser to Robotics maint (#33267)
🆑 coiax
add: The drone dispenser on Metastation has been moved to the
maintenance by Robotics.
/🆑

This puts in line with other maps where the drone dispenser is in
maintenance/science department, rather than on Metastation where it's in
the command only museum.
2017-12-05 18:45:03 -05:00
coiax dd67e1e4e1 Good Clean Fun: A vending machine for games! (#33265)
* Good Clean Fun: A vending machine for games!

🆑 coiax
add: Quiet areas of libraries on station have now been equipped with a
vending machine containing suitable recreational activities.
/🆑

- Sprite by WJohn
- Removes dice bags and cards from the tables of libraries, you can now
get them from the vendor.
- If we ever implement checkers or go or chess, we should add the
playing kits to the vendor.

* Add sprites, and it compiles

* Map modifications

* Moves defines to end of file
2017-12-05 18:19:36 -05:00
Mark9013100 821149505b Omegastation Fixes (#33249) 2017-12-05 18:19:01 -05:00
coiax e24fa4b0a6 [Metastation] Removes window on ORM and the spare ORM (#33200)
* [Metastation] Removes window spawner on cargo ORM

There was a window spawner on the ORM. It's gone now.

* Never mind, there's just not supposed to be an ORM there

* Revert "Never mind, there's just not supposed to be an ORM there"

This reverts commit 778f613abc5d9b1446b3a077fa4ec85a48fce982.

* Removes the spare ORM
2017-12-05 15:31:46 -05:00
coiax cbbf664052 [Metastation] Easel in Quiet Room moved to art storage (#33240)
That easel awkwardly blocks access to the table in the corner, so I've
moved it to art storage, removing a photocopier from art storage to
allow it to fit.
2017-12-05 02:55:37 -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
Leo 80aad8cef0 Merge pull request #33165 from MrStonedOne/revert-33062-ore_stacking
Revert "Ore Stacking"
2017-12-02 18:00:45 -02:00
Leo e64908bd2a Merge pull request #33179 from nicbn/removesmices
Removes the mob mouse from maintenance from maps
2017-12-01 22:00:46 -02:00
Okand37 4d5354fd80 Fixes deltastation's cargo area not having an area(?) 2017-11-29 22:23:21 -07:00
nicbn 651884b4f1 Removes the mob mouse from maintenance from maps 2017-11-29 18:17:38 -02: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
ACCount 81fb344c75 Removes mass-spectrometers (#32965) 2017-11-28 10:19:08 -02:00
ShizCalev 59dc33dfa6 unkevinz the station maps (#33091)
* unkevinzes the station maps

* Added wardrobe
2017-11-26 20:14:29 -06:00