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
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
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
fa38b8a2f3
[MIRROR] Readds the syndicate comms officer ( #5290 )
...
* Readds the syndicate comms officer
* Update listeningstation.dmm
2018-02-05 03:19:54 -06:00
5385333a64
Fixes some broken accesses ( #5287 )
2018-02-05 02:25:16 -06:00
c2f14117c4
[MIRROR] Lava map slights ( #5273 )
...
* Lava map slights (#35201 )
* Updates a few maps a tad on lavaland
* Adds two freezers to syndicate lavaland for some chefing
* Lava map slights
2018-02-05 02:09:45 -06:00
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
450fda474a
[MIRROR] Corrects space tiles on Abandoned Teleporter ( #5224 )
...
* Corrects space tiles on Abandoned Teleporter
* Corrects space tiles on Abandoned Teleporter
2018-02-04 22:06:04 -06:00
faccc43461
fucking github REEEEEEEEEEE
2018-01-31 18:33:46 -06:00
d7659ac6b2
sync with master
2018-01-31 07:02:55 -06:00
56232d5d60
Maps and misc
2018-01-31 06:20:26 -06:00
a45e8527db
Merge pull request #5121 from Citadel-Station-13/upstream-merge-34935
...
[MIRROR] OH GOD HOW DID THE MAPS GET SMALLER?
2018-01-31 03:02:10 -06:00
03086dfa91
Tg 1 28 sync testing/confirmation ( #5178 )
...
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
2018-01-29 04:42:29 -06:00
0ceb915b60
Same with the SPACE_IS_SMALLER but only with smaller maps ( #34984 )
2018-01-27 23:20:25 -06:00
6d5250f18b
Shrinks template maps ( #34935 )
...
* OH GOD HOW DID THE MAPS GET SMALLER?
* How did that happen?
* Removes one more row
2018-01-26 08:46:40 -06:00
1dffa54809
Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623
...
[MIRROR] Makes templates able to use PlaceOnTop
2018-01-24 21:44:21 -06:00
829cf4d180
Merge pull request #34623 from ninjanomnom/template-placeontop
...
Makes templates able to use PlaceOnTop
2018-01-24 18:18:31 -06:00
5d4531010d
Merge pull request #34841 from ShizCalev/derelict-fix
...
Fixes derelict area issues
2018-01-24 18:09:54 -06:00
8fe7ac2b6f
Merge pull request #4927 from Citadel-Station-13/upstream-merge-34581
...
[MIRROR] Corrects some stacked turf
2018-01-21 11:46:51 -06:00
95b6959190
Merge pull request #34576 from coiax/removes-teleport-beacon-from-golem-ship
...
Removes teleport beacon from Free Golem Ship
2018-01-19 08:50:20 -06:00
b59c8c6e71
Merge pull request #34581 from ShizCalev/stacked-turf-cleanup
...
Corrects some stacked turf
2018-01-19 08:16:31 -06:00
f93ca08aa7
Fixes irreparable plating ( #34472 )
2018-01-18 20:13:25 -06:00
9e0f8384e5
ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS
2018-01-17 23:51:54 -05:00
c9afc3e53d
Merge pull request #34319 from ShizCalev/travis-maps
...
Fails travis on common mapping mistakes
2018-01-16 14:37:26 -06:00
16596405e1
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 07:18:15 -06:00
8c1c9f5cd7
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 04:23:03 -06:00
7280d91628
Minor boxstation changes, merges #4694 and #4697
2018-01-08 00:55:05 -05:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
9d0a4722e5
turns the baseturf var into a part time list ( #33705 )
2017-12-25 19:11:06 -06:00
52257ff371
Merge pull request #33710 from ShizCalev/crashedship
...
Corrects crashedship diags
2017-12-21 14:25:11 -06:00
8a0aa32335
Mi-go
2017-12-17 04:11:01 -06:00
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
57ab98d8bc
Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152
...
[MIRROR] Airlock Construction Update
2017-12-10 23:49:51 +00:00
d6b0683846
Airlock Construction Update
2017-12-10 15:23:34 -06:00
3716512810
Removes juicers
2017-12-08 10:33:28 -06:00
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
fb4787fbd1
Oldstation edits/fixes ( #33080 )
2017-11-26 00:01:21 -06:00
7ea123449b
Fix misplaced corners in the Hotel ( #33016 )
2017-11-24 13:00:18 -06:00
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
1b094a4374
Fixes deleted turfs
2017-11-22 22:01:05 -06:00
38c45fb479
Refactor chasm paths to be more sane ( #32701 )
...
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.
Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
2017-11-22 03:30:49 -06:00
8a83b50113
Stacked turf cleanup ( #32933 )
2017-11-21 22:28:48 -06:00
2c65f5c6b5
Fixes dynamic lighting / nearstation area issues.
2017-11-21 08:41:54 -06:00
e8ddae5d98
Cleans up floors.dmi a bit and adds new turf decals.
2017-11-20 20:48:06 -06:00
d8e1562fcf
Merge pull request #3995 from deathride58/manualsyncsreeEEEE
...
Manual map syncs + manual mirrors of missed upstream map PRs
2017-11-20 05:12:06 +00:00
d843e75c3b
Merge pull request #32888 from ShizCalev/animal-ruin-tanks
...
Corrects animal ruin tank rotation
2017-11-19 22:24:06 -06:00
fb62491701
manual map syncs + manual missed pr mirrors
2017-11-17 21:34:49 -05:00
b89cedcb08
Cleans up wire varedits ( #32427 )
2017-11-05 17:36:31 -06:00
1e32be17ec
Expands ancient station map areas ( #32391 )
2017-11-04 11:20:21 -05:00
MMMiracles