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

590 Commits

Author SHA1 Message Date
Jordan Brown
b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant 
Makes revenants spawn on dead bodies & bodycontainers
 2018-01-28 18:03:41 -06:00
FrozenGuy5
a77e139fd8 Changes up the Construction Area on Box slightly. 2018-01-28 14:33:41 -06:00
Jalleo
0ceb915b60 Same with the SPACE_IS_SMALLER but only with smaller maps (#34984) 2018-01-27 23:20:25 -06:00
LetterJay
13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466 
[MIRROR] Fake nuclear disks are even more convincing
 2018-01-25 13:41:02 -06:00
LetterJay
069972b3a0 map 2018-01-25 12:59:30 -06:00
LetterJay
41adb46c2a fixes travis 2018-01-24 21:51:02 -06:00
LetterJay
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
LetterJay
c30127d0d5 Merge pull request #5089 from Citadel-Station-13/upstream-merge-34841 
[MIRROR] Fixes derelict area issues
 2018-01-24 21:43:24 -06:00
Jordan Brown
829cf4d180 Merge pull request #34623 from ninjanomnom/template-placeontop 
Makes templates able to use PlaceOnTop
 2018-01-24 18:18:31 -06:00
Jordan Brown
5d4531010d Merge pull request #34841 from ShizCalev/derelict-fix 
Fixes derelict area issues
 2018-01-24 18:09:54 -06:00
MMMiracles
521e309da4 baseturf editors on syndicate base (#34815) 2018-01-24 15:43:33 -06:00
LetterJay
937d6c473a Merge pull request #5048 from Citadel-Station-13/upstream-merge-34769 
[MIRROR] Cleans up unused mob vars
 2018-01-24 13:56:23 -06:00
Jordan Brown
d7975510e4 Fixes omega missing a wheat fridge and runtiming pipenets 2018-01-24 06:12:20 -06:00
Leo
90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup 
Cleans up unused mob vars
 2018-01-23 06:44:32 -06:00
coiax
f425c5496f Fake nuclear disks are even more convincing 2018-01-23 01:41:21 -06:00
LetterJay
c5ec80819f Merge pull request #4943 from Citadel-Station-13/upstream-merge-34571 
[MIRROR] Low memory mode
 2018-01-21 11:47:27 -06:00
LetterJay
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
deathride58
15d1adfea8 Update _basemap.dm 2018-01-19 14:38:12 -05:00
Jordan Brown
f706605227 Low memory mode 2018-01-19 09:12:37 -06:00
Jordan Brown
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
Leo
b59c8c6e71 Merge pull request #34581 from ShizCalev/stacked-turf-cleanup 
Corrects some stacked turf
 2018-01-19 08:16:31 -06:00
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