shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,656 Commits 5 Branches 0 Tags
fc04d94a293342355a2a00a26fcd186b2000e072
Commit Graph

99 Commits

Author SHA1 Message Date
ShizCalev
b89cedcb08 Cleans up wire varedits (#32427) 2017-11-05 17:36:31 -06:00
WJohn
1e32be17ec Expands ancient station map areas (#32391) 2017-11-04 11:20:21 -05:00
ACCount
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
deathride58
930f6405b2 Map syncs 1 - initial commit, hard sync with TG 2017-10-23 12:47:38 -04:00
CitadelStationBot
1a94726bdc [MIRROR] Fixes conflicting IDs on ruined whiteship (#3525) 
* Fixes conflicting IDs

* Fixes conflicting IDs on ruined whiteship
 2017-10-21 03:44:47 -05:00
ShizCalev
d43de80540 Corrects caravan ambush tool speed (#31792) 
* Corrects caravan ambush tool speed

* subtype
 2017-10-17 08:22:07 -05:00
WJohn
4b3f578633 Readds the boxstation whiteship as a ruin. (#31709) 
* Adds box's whiteship back as a broken down relic.

* And accompanying files to make it work.

* Derp
 2017-10-15 11:31:48 -05:00
LetterJay
c442f49cde Merge pull request #3373 from Citadel-Station-13/upstream-merge-31645 
[MIRROR] Cleans up explosives at syndie base
 2017-10-14 10:20:27 -04:00
ShizCalev
c7afe4f70e Cleans up explosives at syndie base ruin (#31645) 2017-10-13 16:29:36 -05:00
ShizCalev
74c9b75ba1 Refactors away mission & space ruin area code. 2017-10-12 12:46:52 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
LetterJay
06bfc02357 Merge pull request #3293 from Citadel-Station-13/upstream-merge-31507 
[MIRROR] Cleans up warning line varedits
 2017-10-10 22:33:06 -04:00
Jordan Brown
b1c26daf8b Merge pull request #31507 from ShizCalev/varedit-cleanup 
Cleans up warning line varedits
 2017-10-10 13:29:48 -05:00
Jordan Brown
039b6ae9ce Merge pull request #31505 from ShizCalev/crashed-ship-fix 
Fixes crashed ship runtime
 2017-10-10 12:42:52 -05:00
LetterJay
8269450398 MapSync with /tg/ 2017-10-08 22:46:45 -05:00
LetterJay
aec96bbbbe Merge pull request #2906 from deathride58/ashwalkerkinkmates 
Adds dildos to ashwalker ruin
 2017-10-03 15:23:07 -04:00
KorPhaeron
d3c37c83de Removes step throwers from cult altar (#31083) 2017-09-30 01:00:12 -05:00
pubby
34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
deathride58
5ca691894c adds dildos to ashwalker ruin 2017-09-23 02:37:43 -04:00
CitadelStationBot
6efb76fad5 [MIRROR] Ammo cleanup (#2643) 
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
 2017-09-22 22:30:44 -05:00
CitadelStationBot
8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847) 
* New squeaky datum and plushes

* Update bananashoes.dm
 2017-09-22 19:43:56 -05:00
CitadelStationBot
628a2442e2 [MIRROR] Slightly remaps and adds more supplies to the animal hospital ruin (#2705) 
* Merge pull request #30505 from Xhuis/vet_remap

Slightly remaps and adds more supplies to the animal hospital ruin

* Slightly remaps and adds more supplies to the animal hospital ruin
 2017-09-19 06:37:56 -05:00
CitadelStationBot
83ec9b6d26 [MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references (#2768) 
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)

* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references

* Cleans up showcase & plaque varedits, updated loyalty implant references
 2017-09-17 23:07:05 -05:00
CitadelStationBot
e2e85e9294 [MIRROR] Window Spawner Refactor (#2815) 
* Window spawner refactor (#30747)

* Window Spawner Refactor
 2017-09-17 22:42:22 -05:00
CitadelStationBot
c8b153ee71 [MIRROR] Varedit cleanup mk4 (#2833) 
* Varedit cleanup mk4 (#30794)

* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description

* Varedit cleanup mk4
 2017-09-17 22:31:30 -05:00
CitadelStationBot
d64c23b7f9 [MIRROR] Fix syndicate toy C20r and L6 Saw not having riot darts (#2740) 
* Fix syndicate toy C20r and L6 Saw not having riot darts  (#30645)

*   Add riot darts back into toy C20r and L6 Saw

Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.

* Comments are good

Especially when inheritance makes everything weird.

* Fix syndicate toy C20r and L6 Saw not having riot darts
 2017-09-13 20:57:54 -05:00
Poojawa
8406baebbe Makes APC cell_type actually pick a cell (#2747) 
* Ports TG#30327

* Update apc.dm

* maybe delta can be fully copies over, yes?
 2017-09-13 19:57:21 -05:00
CitadelStationBot
63ebf08a0d [MIRROR] Adds shovels to the golem ship (#2742) 
* Adds shovels to the golem ship

* Adds shovels to the golem ship
 2017-09-13 16:56:30 -05:00
Militaires
3aec72d4f4 Adds Gondoland and the rare Gondolas (#30530) 
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
 2017-09-10 17:10:45 -05:00
ShizCalev
849deb5e4e Cleans up more paper fluff varedits. (#30418) 2017-09-06 18:42:43 -05:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
CitadelStationBot
12ff0e7406 Removes the suppose-to-be unused shuttle wall path 2017-08-28 02:20:45 -05:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
LetterJay
7ab92ade3c Update lavaland_surface_xeno_nest.dmm 2017-08-18 11:13:45 -05:00
CitadelStationBot
deffc1b1f1 More baseturf helpers 2017-08-13 01:28:20 -05: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
CitadelStationBot
0f23a00e40 Cleaned up some turf decals, fixed beach away mission (#2152) 2017-07-26 22:56:55 -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
CitadelStationBot
49ee9d6cc9 roundstart AT cleanup (#2103) 2017-07-24 04:07:02 -07:00