9a33ac7177
TGUI recompile, fixes map conflicts
2018-01-11 00:05:34 -05:00
1f88c0c660
[READY]Cargo Update: Nanotrasen Supply Drop Pods!
2018-01-10 03:12:07 -06:00
7280d91628
Minor boxstation changes, merges #4694 and #4697
2018-01-08 00:55:05 -05:00
fcad1432a9
readds citadel specific map changes
2018-01-07 17:04:51 -05: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
f021ed2716
Merge pull request #33450 from ShizCalev/sec-lockers
...
Adds security departmental lockers to Box & Pubby
2017-12-12 13:06:59 -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
7e68709634
Merge pull request #4272 from Citadel-Station-13/upstream-merge-33342
...
[MIRROR] [Box] Moves drone dispenser to Robotics maintenance
2017-12-11 00:41:04 +00:00
add4b774e5
fixes map conflicts
2017-12-10 19:00:08 -05: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
9d50222ef6
fixes merge conflicts
2017-12-10 17:54:20 -05:00
d6b0683846
Airlock Construction Update
2017-12-10 15:23:34 -06:00
04dc992f97
[Box] Moves drone dispenser to Robotics maintenance
2017-12-08 10:35:39 -06:00
1cc3e865bf
Good Clean Fun: A vending machine for games!
2017-12-05 17:20:21 -06:00
f6a2966fca
fixes merge conflicts
2017-12-04 18:24:04 -05:00
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00: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
f016daa833
Merge pull request #33179 from nicbn/removesmices
...
Removes the mob mouse from maintenance from maps
2017-12-02 09:44:39 -06:00
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
470f4169df
Merge pull request #4095 from Citadel-Station-13/upstream-merge-33018
...
[MIRROR] Replaces "console screen" stock part with glass sheets
2017-11-24 06:42:51 +00:00
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
c81ebbfc24
fixes boxstation issues, readds removed boxstation areas
2017-11-22 22:18:40 -05:00
8a83b50113
Stacked turf cleanup ( #32933 )
2017-11-21 22:28:48 -06:00
5d5d4451a9
fixes merge conflicts
2017-11-21 14:35:43 -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
0d11dfc6ef
COMPILE, FOUL CREATURE
2017-11-20 23:39:23 -05:00
d52e405912
hOPEFULLY FIXES THE GOD DAMN MERGE CONFLICTS
2017-11-20 23:12:58 -05:00
e8ddae5d98
Cleans up floors.dmi a bit and adds new turf decals.
2017-11-20 20:48:06 -06: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
5113a71cff
Merge pull request #3807 from Citadel-Station-13/upstream-merge-32403
...
[MIRROR] Removes Freon preset gas filters from all maps
2017-11-04 22:54:06 -05:00
cd9bab3052
Merge pull request #3799 from deathride58/furtherboxedits
...
Boxstation Edits: Legless Warden edition
2017-11-04 22:50:58 -05:00
b1b69d107b
Removes Freon preset gas filters from all maps ( #32403 )
2017-11-04 14:24:35 -05:00
43dcaed39e
Blech
2017-11-04 01:18:23 -04:00
961991f7e4
github for windows is an amazing git client
2017-11-04 00:56:31 -04:00
1c38ebd9e4
tons of map changes to go around
2017-11-04 00:55:56 -04: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
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
6316c0d989
Fixes pipe runetime
2017-10-25 23:32:40 -05:00
2fc3636360
FUCK part 3 - fixes gravity generator assmos and also makes nonlethal armory look less like ass while im at it
2017-10-23 18:12:26 -04:00
0a3f908a7b
FUCK - fixes brig wiring
2017-10-23 17:33:04 -04:00
cfb6f98c3c
FIXES RWALL YES THIS IS NECESSARY FUCK
2017-10-23 15:58:33 -04:00
c77421ec4a
EMERGENCY BOX CLOWN/MIME OFFICE HOTFIX
2017-10-23 15:36:51 -04:00
6ead40bcee
Boxstation security changes
2017-10-23 14:43:05 -04:00
268c80dc66
fixes areas, other small changes
2017-10-23 14:26:05 -04:00
deathride58