shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,435 Commits 5 Branches 0 Tags
d151ebf24792f2abb8438ec22d540a77054cdc11
Commit Graph

295 Commits

Author SHA1 Message Date
CitadelStationBot
d151ebf247 [Omega] Corrected space turf under syndie shuttle corners (#2418) 2017-08-22 18:13:23 -07:00
CitadelStationBot
4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -07:00
CitadelStationBot
c09ec3eb91 fixed delta's n2o console and adds fireaxe to atmos 2017-08-19 18:41:30 -05:00
LetterJay
094c4847f7 Merge pull request #2355 from Citadel-Station-13/upstream-merge-29849 
[MIRROR] More baseturf helpers
 2017-08-18 11:26:53 -05:00
LetterJay
7ab92ade3c Update lavaland_surface_xeno_nest.dmm 2017-08-18 11:13:45 -05:00
CitadelStationBot
96acbf9853 fixes a blue tile on delta 2017-08-16 01:11:29 -05:00
CitadelStationBot
cfebaa6646 Unlocked miner closet in Pubby aux_base dock 2017-08-14 16:05:29 -05:00
CitadelStationBot
deffc1b1f1 More baseturf helpers 2017-08-13 01:28:20 -05:00
CitadelStationBot
1291b12273 Cleaned up stacked pipes 2017-08-13 01:28:11 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
521c149627 [Pubby] added turrets to AI sat bridge area (#2235) 2017-08-05 10:30:21 -07:00
CitadelStationBot
8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162) 
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
 2017-08-02 04:56:44 -05:00
CitadelStationBot
76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156) 
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
 2017-08-02 03:17:32 -05:00
LetterJay
3d6200ce41 Merge pull request #2143 from Citadel-Station-13/upstream-merge-29492 
[MIRROR] Tweaks the ash walker nest so that lava rivers won't wreck them
 2017-08-01 23:55:53 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
LetterJay
cccfeb479e Update lavaland_surface_ash_walker1.dmm 2017-07-31 23:38:15 -05:00
LetterJay
6fb37022f5 Merge pull request #2189 from Raeschen/Raes_reducemobs 
Reduces amount of mobs on oldstation.dmm
 2017-07-30 23:12:49 -05:00
Raeschen
4032f5de36 Used map merging tool 2017-07-30 17:13:39 +01:00
Raeschen
e5749b08f7 Merge branch 'Raes_reducemobs' of https://github.com/Raeschen/Citadel-Station-13 into Raes_reducemobs 
# Conflicts:
#	_maps/RandomRuins/SpaceRuins/oldstation.dmm
 2017-07-30 17:10:38 +01:00
Raeschen
824e4287f2 Heavily reduced the amount of mobs on oldstation.dmm due to NPC POOL MC lag. (Previously about 109 hivebots, now there are fewer, stronger ones.) 
Edit: Actually used map merge this time.
 2017-07-30 17:05:39 +01:00
Raeschen
a6662da11d Heavily reduced the amount of mobs on oldstation.dmm due to NPC POOL MC lag. (Previously about 109 hivebots, now there are fewer, stronger ones.) 2017-07-30 14:03:01 +01:00
LetterJay
70a5aed428 Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977 
[MIRROR] Augment Styles/Changes
 2017-07-29 23:56:52 -05:00
CitadelStationBot
0f23a00e40 Cleaned up some turf decals, fixed beach away mission (#2152) 2017-07-26 22:56:55 -07:00
CitadelStationBot
7c65bae7ba Cleaned up doubled turf on omega (#2150) 2017-07-26 22:56:43 -07:00
CitadelStationBot
7cdeae21a5 Moved abductor ships further apart (#2149) 2017-07-26 22:56:13 -07:00
CitadelStationBot
9b7a0c5d54 Tweaks the ash walker nest so that lava rivers won't wreck them 2017-07-26 15:44:58 -05:00
CitadelStationBot
147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
LetterJay
51846b1efd Merge pull request #2122 from Citadel-Station-13/upstream-merge-29485 
[MIRROR] Map Spellcheck
 2017-07-25 12:56:27 -05:00
CitadelStationBot
b998e14a5b Map Spellcheck 2017-07-24 21:16:46 -05:00
CitadelStationBot
32586afe69 cerestation grammar fix 2017-07-24 21:16:41 -05:00
CitadelStationBot
37b9e24bc0 Removes the gulag sink and water bottles from the sustenance vendor. (#2094) 2017-07-24 04:08:56 -07:00
CitadelStationBot
49ee9d6cc9 roundstart AT cleanup (#2103) 2017-07-24 04:07:02 -07:00
LetterJay
1e2fd6c235 Merge pull request #2044 from Citadel-Station-13/upstream-merge-29293 
[MIRROR] Made cell / holding cell windoors their own subtype
 2017-07-19 13:41:37 -05:00
LetterJay
e94cb572e7 Merge pull request #2077 from Citadel-Station-13/upstream-merge-29328 
[MIRROR] [Delta] fixed doppler direction
 2017-07-19 13:30:59 -05:00
LetterJay
27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260 
[MIRROR] Changes all access const to be a define
 2017-07-19 13:18:58 -05:00
CitadelStationBot
66b42903cb [Delta] fixed doppler direction 2017-07-19 10:25:33 -05:00
CitadelStationBot
0ce34e08b6 Augment Styles/Changes 2017-07-18 06:45:44 -05:00
CitadelStationBot
b29641d23e [Meta] Minor Whiteship Edits (#2042) 2017-07-17 22:55:42 -07:00
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBot
755de4f223 Made cell / holding cell windoors their own subtype 2017-07-17 06:52:17 -05:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot
d286ed197e Cleaned up duped vars 2017-07-15 22:28:58 -05:00
CitadelStationBot
3f1204e31d [Deltastation] Fixes some access issues 2017-07-13 17:46:30 -05:00
CitadelStationBot
cce816f900 Fixed walls on pubby shuttle (#1968) 2017-07-10 16:13:37 -07:00
CitadelStationBot
ce82313f30 Alters Meta's robo resources to an amount closer to Box's (#1966) 2017-07-10 16:13:27 -07:00
CitadelStationBot
292bed59f0 Adds a crew monitoring console to the warden's office in BoxStation 2017-07-09 19:43:35 -05:00
CitadelStationBot
acb20fcde2 Box Viro Wants Plasma v2 2017-07-08 09:45:42 -05:00
CitadelStationBot
a85476ec78 Corrected misplaced vents on Delta (#1939) 2017-07-07 23:48:37 -07:00
TalkingCactus
cb5247d060 Fixes Gamemode Voting & Map Edits (#1937) 
* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta
 2017-07-07 17:54:53 -04:00