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
8b4788a884
Merge pull request #34101 from ShizCalev/got-a-light-
...
Removes omnizine (traitor) cigarettes from captain's office on Meta
2018-01-11 14:05:06 -06:00
fcad1432a9
readds citadel specific map changes
2018-01-07 17:04:51 -05:00
d2ec28b1e6
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
53d7dfbb9b
Fixes meta toxins lab ( #34087 )
2018-01-05 06:01:27 -06:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
9dd9d9413a
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 02:27:12 -06:00
e7f3cd9e24
Map syncs - departmental lathes and more
2017-12-13 14:37:48 -05: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
276a2c1015
Merge pull request #4241 from Citadel-Station-13/upstream-merge-33267
...
[MIRROR] [Metastation] Moves drone dispenser to Robotics maint
2017-12-10 23:55:35 +00:00
cdc23ad79e
Merge pull request #4240 from Citadel-Station-13/upstream-merge-33265
...
[MIRROR] Good Clean Fun: A vending machine for games!
2017-12-10 23:50:05 +00:00
3a8c2b3be0
fixes map conflicts
2017-12-10 18:17:25 -05:00
d6b0683846
Airlock Construction Update
2017-12-10 15:23:34 -06:00
3b665e6af1
[Metastation] Moves drone dispenser to Robotics maint
2017-12-05 17:45:59 -06:00
1cc3e865bf
Good Clean Fun: A vending machine for games!
2017-12-05 17:20:21 -06:00
e7fd239238
[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 03:22:56 -06:00
f6a2966fca
fixes merge conflicts
2017-12-04 18:24:04 -05: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
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
0ca050563f
fixes merge conflicts
2017-11-22 23:43:03 -05:00
1b094a4374
Fixes deleted turfs
2017-11-22 22:01:05 -06:00
8a83b50113
Stacked turf cleanup ( #32933 )
2017-11-21 22:28:48 -06:00
5a331eedad
Merge pull request #4055 from Citadel-Station-13/upstream-merge-32931
...
[MIRROR] Fixes dynamic lighting / nearstation area issues.
2017-11-21 21:23:46 +00:00
05800235b5
fixes mapping errors introduced in #4049
2017-11-21 13:54:20 -05:00
2c65f5c6b5
Fixes dynamic lighting / nearstation area issues.
2017-11-21 08:41:54 -06:00
e72399de7c
pain
2017-11-21 00:29:15 -05:00
019b57316d
i want to die
2017-11-20 23:53:14 -05:00
0d11dfc6ef
COMPILE, FOUL CREATURE
2017-11-20 23:39:23 -05:00
4e727ee576
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
...
# Conflicts:
# _maps/map_files/MetaStation/MetaStation.dmm
2017-11-20 23:34:46 -05:00
d52e405912
hOPEFULLY FIXES THE GOD DAMN MERGE CONFLICTS
2017-11-20 23:12:58 -05:00
ac2324fde8
fixes merge conflicts
2017-11-20 22:50:19 -05:00
e8ddae5d98
Cleans up floors.dmi a bit and adds new turf decals.
2017-11-20 20:48:06 -06:00
32d9ea87f6
Various Meta area fixes
2017-11-20 02:43:09 -06:00
d0e7fde37b
merges #4007
2017-11-19 02:46:18 -05:00
fb62491701
manual map syncs + manual missed pr mirrors
2017-11-17 21:34:49 -05:00
9dff28b50d
Improves the deep fryer
2017-11-13 03:16:11 -06:00
2f21f16b53
initial commit - syncs and fiXES EVERYTHING WRONG ABOUT BOX HOLY FUCK HOW DID NOBODY REPORT ALL THIS SHIT
2017-11-08 17:04:20 -05:00
cc438ea9b4
Refactors and improvements to xenobio slime processor ( #32406 )
...
* Do not let your memes be dreams
* static lists for great justice
* Local man forgets to capitalize a word
* Slime processor no longer runtimes when processing food
2017-11-05 04:32:07 -06:00
b1b69d107b
Removes Freon preset gas filters from all maps ( #32403 )
2017-11-04 14:24:35 -05:00
a3783943a7
Internal map improvements ( #32310 )
...
* Internal map improvements
* More map sheet fixes
* PubbyStation fix
* More map fixes
2017-11-02 01:23:30 -05:00
98a9c8933f
fixes the table ( #32189 )
2017-10-29 10:57:34 -05:00
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
bc3e8968ab
Deltastation + Metastation map changes
2017-10-23 13:41:57 -04:00
930f6405b2
Map syncs 1 - initial commit, hard sync with TG
2017-10-23 12:47:38 -04:00
592f6d89f2
Adds missing petbed on Meta
2017-10-18 11:54:56 -05:00
df524ddaa6
Fixes mapping issues introduced in #30909
2017-10-17 13:36:08 -05:00
89fbf077d9
Fixes missing semicolon in sargeant araneus vars ( #31790 )
...
* semicolon
* no define
2017-10-16 22:55:31 -05:00
24631746d4
Merge pull request #3414 from Citadel-Station-13/upstream-merge-31707
...
[MIRROR] Restores security bombsuit & white bombsuit
2017-10-16 14:12:28 -04:00
af5dab8436
fixE ( #31740 )
2017-10-15 20:56:34 -05:00
oranges