shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,664 Commits 5 Branches 0 Tags
a7ec44bfccd29bbd9a96fd0d2fe8dbfadf42e72f
Commit Graph

555 Commits

Author SHA1 Message Date
oranges
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
deathride58
9a33ac7177 TGUI recompile, fixes map conflicts 2018-01-11 00:05:34 -05:00
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58
7280d91628 Minor boxstation changes, merges #4694 and #4697 2018-01-08 00:55:05 -05:00
deathride58
fcad1432a9 readds citadel specific map changes 2018-01-07 17:04:51 -05:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
ShizCalev
53d7dfbb9b Fixes meta toxins lab (#34087) 2018-01-05 06:01:27 -06:00
deathride58
9834c3a499 merges #4665 2018-01-04 22:52:05 -05:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay
d8e85b5f15 Merge pull request #4613 from Citadel-Station-13/upstream-merge-33945 
[MIRROR] Improves loot drop spawners, adds AI law spawners to cores
 2017-12-31 02:52:44 -06:00
vuonojenmustaturska
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
Jordan Brown
a89f221d35 Removes chemist job from omegastation (#33863) 
* Removes chemist job from omegastation

* Remove chemist start points
 2017-12-30 16:04:36 -06:00
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
deathride58
a8154d102a Merge pull request #4531 from Citadel-Station-13/upstream-merge-33777 
[MIRROR] Arena shuttle teleport fix
 2017-12-28 02:53:47 +00:00
Tad Hardesty
9a14a721c2 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 13:51:13 -06:00
LetterJay
8cd36f9927 Merge pull request #4492 from Citadel-Station-13/upstream-merge-33711 
[MIRROR] adds mining scanners to the gulag
 2017-12-25 21:27:39 -06:00
Emmett Gaines
a1ec5538a6 Arena shuttle teleport fix (#33777) 2017-12-25 19:12:20 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
WJohn
6cfd346bdd Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731) 2017-12-22 10:35:47 -06:00
awesine
f56edf2f1f adds mining scanners to the gulag (#33711) 
* Add files via upload

* Add files via upload
 2017-12-21 19:24:08 -06:00
Jordan Brown
52257ff371 Merge pull request #33710 from ShizCalev/crashedship 
Corrects crashedship diags
 2017-12-21 14:25:11 -06:00
Armhulen
8a0aa32335 Mi-go 2017-12-17 04:11:01 -06:00
deathride58
e7f3cd9e24 Map syncs - departmental lathes and more 2017-12-13 14:37:48 -05:00
Jordan Brown
f021ed2716 Merge pull request #33450 from ShizCalev/sec-lockers 
Adds security departmental lockers to Box & Pubby
 2017-12-12 13:06:59 -06:00
CitadelStationBot
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
deathride58
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
deathride58
add4b774e5 fixes map conflicts 2017-12-10 19:00:08 -05:00
deathride58
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
deathride58
d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148 
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
 2017-12-10 23:50:20 +00:00
deathride58
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
deathride58
57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00:00
deathride58
c116054efc Merge pull request #4256 from Citadel-Station-13/upstream-merge-33361 
[MIRROR] Removes juicers
 2017-12-10 23:49:41 +00:00
deathride58
3a8c2b3be0 fixes map conflicts 2017-12-10 18:17:25 -05:00
deathride58
4b8c3f808e fixes map conflicts 2017-12-10 18:12:33 -05:00
deathride58
9d50222ef6 fixes merge conflicts 2017-12-10 17:54:20 -05:00
deathride58
216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935 
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
 2017-12-10 22:43:58 +00:00
uraniummeltdown
d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
Cruix
746e57bd86 Allowed shuttle docking ports to be hidden from some shuttle docking computers 2017-12-10 14:23:08 -06:00
Tad Hardesty
047800c51c Cycle-link airlocks in the mining base (#33095) 2017-12-09 01:52:03 -06:00
coiax
04dc992f97 [Box] Moves drone dispenser to Robotics maintenance 2017-12-08 10:35:39 -06:00
ACCount
3716512810 Removes juicers 2017-12-08 10:33:28 -06:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
coiax
3b665e6af1 [Metastation] Moves drone dispenser to Robotics maint 2017-12-05 17:45:59 -06:00
coiax
1cc3e865bf Good Clean Fun: A vending machine for games! 2017-12-05 17:20:21 -06:00
Mark9013100
e8b23a8c75 Omegastation Fixes (#33249) 2017-12-05 17:19:08 -06:00
deathride58
a6aa181161 Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124 
[MIRROR] Moves some machine sprites into /machines/ folder
 2017-12-05 20:37:30 +00:00
deathride58
44d54c66f1 Merge pull request #4215 from Citadel-Station-13/upstream-merge-33230 
[MIRROR] Adds disco inferno shuttle.
 2017-12-05 20:18:21 +00:00
ACCount
435e46e407 Moves some machine sprites into /machines/ folder 2017-12-05 03:24:03 -06:00
coiax
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