shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,183 Commits 5 Branches 0 Tags
57c829a2aab6dca828af5cdcf703dfd70f3be984
Commit Graph

569 Commits

Author SHA1 Message Date
ShizCalev
f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
deathride58
d7e2967bc8 Merge pull request #4891 from Citadel-Station-13/upstream-merge-34502 
[MIRROR] Update Space Station 13 decal on RuntimeStation
 2018-01-17 20:13:17 +00:00
Jordan Brown
ed95343715 Merge pull request #34502 from AutomaticFrenzy/patch/runtime-decal 
Update Space Station 13 decal on RuntimeStation
 2018-01-16 14:47:02 -06:00
oranges
c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps 
Fails travis on common mapping mistakes
 2018-01-16 14:37:26 -06:00
Jordan Brown
ca154abed1 Merge pull request #34471 from Thunder12345/shuttlefix2 
No more air leaks from the asteroid shuttle
 2018-01-16 07:32:25 -06:00
deathride58
30af76a0a2 Merge pull request #4845 from Citadel-Station-13/upstream-merge-34325 
[MIRROR]  Makes the lavaland mining base have more correct baseturfs
 2018-01-15 15:40:45 +00:00
Emmett Gaines
a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
WJohn
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
Dax Dupont
077ec06f78 Rebases and redoes it with the fix with mapmerge2 2018-01-13 14:52:21 -06:00
deathride58
a572a24dfe Merge pull request #4809 from Citadel-Station-13/upstream-merge-34355 
[MIRROR] Fixes goon escape shuttle
 2018-01-13 20:28:22 +00:00
Leo
710f69aac9 Merge pull request #34355 from Thunder12345/shuttlefix 
Fixes goon escape shuttle
 2018-01-13 08:59:55 -06:00
oranges
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
Dax Dupont
af73323477 Adds an indestructible disco/dance machine for admemes and disco inferno shuttle (#34260) 
* Dance machine fix

* I have no ass and i must blast
 2018-01-11 21:36:56 -06:00
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