Commit Graph

141 Commits

Author SHA1 Message Date
Poojawa
e6597a192a Fixed duplicate turfs 2019-04-14 00:04:24 -05:00
Poojawa
29f4dfca83 Maps batch fixed 2019-04-13 23:30:22 -05:00
Trilbyspaceclone
b1205baa76 Update mrow_thats_right.dmm 2019-03-18 17:41:12 -04:00
deathride58
1c7fc9c699 Merge pull request #8067 from Trilbyspaceclone/patch-67
Makes Dinner for two have loot
2019-03-08 20:44:23 -05:00
Trilbyspaceclone
7edaff99de Update derelict2.dmm 2019-02-28 19:01:54 -05:00
Trilbyspaceclone
e84683330f Update derelict1.dmm 2019-02-27 16:20:46 -05:00
Trilbyspaceclone
f2ae556ee4 Adds two boxes of candles to DEEP (#7851) 2018-12-31 03:06:50 -08:00
Tupinambis
338a98972f Makes the ruin more of a challenge. 2018-11-16 22:34:34 -06:00
Tupinambis
bfe8fda260 Makes hivebots more robust. Makes oldstation not have an excessive amount of hivebots. 2018-11-15 20:25:06 -06:00
Poojawa
99e57fb221 various citadel tweaks/fixes
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
Tupinambis
4b21b60269 Deep Storage Suit Loot Update. (Alternative to PR #7402) (#7449)
* Replaces syndicate hardsuit with mining hardsuit.

* adds jetpack
2018-08-16 13:02:11 -07:00
deathride58
db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
Cw 3040
27b6ebc612 Cw's Spaceruins, Maintbar and Kegspawn changes (#7141)
* Station Changes

-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)

* Space Ruins Changes

-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves

* Kegspawn Change

Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)

* Small MetaStation Fixes

Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
2018-06-18 11:52:11 -07:00
81Denton
e92060a3a9 Makes the caravan ambush ruin harder to cheese (#38509)
* makes caravan ambush more challenging

* SMASH
2018-06-16 15:38:34 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
CitadelStationBot
d62cb31e9b [MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile (#6884)
* Delete some duplicate macro definitions

* sql changelog changes ping the host

* Templates the caravan ambush ruin shuttles

* Update CODEOWNERS

* Update components.dm

* Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile

* Initial Placeholder

* Update caravanambush.dmm
2018-05-27 19:27:56 -07:00
81Denton
0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
Jordan Brown
deddd8debe Merge pull request #37622 from ShizCalev/cockarock
Changes cockroach guts to insect guts
2018-05-03 08:42:46 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326
[MIRROR] Removes SCP_294
2018-04-27 09:35:43 +00:00
Armhulen
17aa0acef8 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-25 10:05:57 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Jordan Brown
44df2b780e 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 11:34:06 -05:00
ShizCalev
5dfd1f7d42 grunge airlock 2018-04-13 09:04:55 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Tad Hardesty
47850573b0 Fix N2 filter in deep storage ruin (#36523) 2018-03-20 07:53:55 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
deathride58
a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
2018-03-09 19:25:12 +00:00
kevinz000
91ac70a73e RND TECHWEBS: TECHFABS (#36055)
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
2018-03-07 21:11:56 -06:00
Dax Dupont
72e3ffa562 Beacons are no longer radios (#36070)
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
2018-03-07 14:43:25 -06:00
CitadelStationBot
766b85908e [MIRROR] Adds the Ancient Cloning Lab ruin (#5814)
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
2018-03-05 15:20:49 -06:00
deathride58
21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733
[MIRROR] [s] Cameranet fixes
2018-02-23 13:21:23 +00:00
CitadelStationBot
758d740112 [MIRROR] Cycle links space ruin airlocks (#5660)
* Cycle links space ruin airlocks (#35870)

* cycle links space ruin airlocks

* loooooooooooooong ship

* Cycle links space ruin airlocks
2018-02-22 23:39:49 -06:00
ShizCalev
d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
Poojawa
7d488e8f4c Citadel'd Maps from #5523 (#5551)
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
2018-02-17 18:04:28 -06:00
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
ExcessiveUseOfCobblestone
745ca227c3 Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities (#35427)
* Update portable_turret.dm

* Update portable_turret.dm

* Update portable_turret.dm

* f
2018-02-13 20:47:14 -06:00
deathride58
e3ad2643b2 maps first 2018-02-12 20:30:05 -05:00
Jordan Brown
ebd82bfe50 Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2
Actually fixes broken accesses
2018-02-11 15:48:40 -06:00
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
MMMiracles
2d499b938c 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 20:23:32 -06:00
CitadelStationBot
717da969a6 [MIRROR] Var cleanup and map fixes (#5359)
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
CitadelStationBot
fa38b8a2f3 [MIRROR] Readds the syndicate comms officer (#5290)
* Readds the syndicate comms officer

* Update listeningstation.dmm
2018-02-05 03:19:54 -06:00
CitadelStationBot
5385333a64 Fixes some broken accesses (#5287) 2018-02-05 02:25:16 -06:00
CitadelStationBot
ba06d1cb97 [MIRROR] Listening fix (#5231)
* 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

* Listening fix
2018-02-04 22:09:38 -06:00