pubby
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05: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
CitadelStationBot
75fe249947
Replaces highpressure windows with plasma windows
2017-07-06 09:11:50 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
Poojawa
789064a3a5
Clean up .rej files
2017-06-28 02:24:03 -05:00
LetterJay
e680da7de6
Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584
...
[MIRROR] Ancient Space Station [Space Spawn Ruin]
2017-06-27 21:25:50 -05:00
LetterJay
10909c9dee
Update oldstation.dmm
2017-06-27 12:21:49 -05:00
LetterJay
e3b1838e63
Merge pull request #1697 from Citadel-Station-13/upstream-merge-28600
...
[MIRROR] Adds a heavily-damaged ripley as a lavaland ruin
2017-06-26 06:24:31 -05:00
LetterJay
5571cca37c
.rej cleanup
2017-06-26 06:14:42 -05:00
CitadelStationBot
d4c54bb0b5
Ancient Space Station [Space Spawn Ruin]
2017-06-25 11:03:27 -05:00
CitadelStationBot
50a4f61663
Adds a heavily-damaged ripley as a lavaland ruin
2017-06-20 12:09:15 -05:00
LetterJay
eb055bc1ec
more and more
2017-06-19 16:56:38 -05:00
LetterJay
ff8b2acf9e
Merge pull request #1461 from Citadel-Station-13/upstream-merge-28145
...
[MIRROR] Syndicate Uplink - Typos & Grammar mk2
2017-06-14 08:58:35 -05:00
CitadelStationBot
c9e8454c3b
Deepstorage Ruin Revamp ( #1407 )
2017-06-13 13:42:03 -07:00
CitadelStationBot
06187dd178
Syndicate Uplink - Typos & Grammar mk2
2017-06-07 14:56:22 -05:00
CitadelStationBot
f8505883d4
Removes dragoontomb ruin and loot. ( #1290 )
2017-06-03 06:39:11 -07:00
LetterJay
7e7b65be63
Delete lavaland_surface_ww_vault.dmm
2017-05-30 21:34:16 -05:00
LetterJay
976086e490
Merge branch 'master' into upstream-merge-27534
2017-05-30 16:45:59 -05:00
CitadelStationBot
87593dd8f7
Lavaland - Ruins now have lights
2017-05-30 14:46:30 -05:00
CitadelStationBot
6b6a156c2f
Lavaland Lighting Fix + ruin varedit cleanup ( #1257 )
2017-05-28 15:27:50 -07:00
