Commit Graph

871 Commits

Author SHA1 Message Date
deathride58
31ba174020 Merge pull request #7630 from Tupinambis/NukeOpsStart
The cooler nuke op base (featuring more air)
2018-10-10 02:03:02 -04:00
nik707
dcd5141d9b fixes various map bugs PASS1 2018-10-08 12:54:56 -05:00
Tupinambis
0b097338fa Please for the love of fuck remove cit map files or triple gay. 2018-10-06 21:26:19 -05:00
Tupinambis
10a887995f Makes the nuke op base cooler and more immersive and such. Enjoy 2018-10-06 19:56:25 -05:00
Poojawa
854dbc81c5 fixes the stragglers of Pubby
See, I knew I didn't get them all.
2018-09-21 03:26:54 -05:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
686f7395c8 some other pubby tile fixes 2018-09-20 05:43:13 -05:00
Poojawa
e7323cdf71 whatever 2018-09-20 05:26:33 -05:00
Poojawa
c836a7e5ea Cleans up map errors
Knowing my fucking luck it ain't all of 'em
2018-09-20 04:28:02 -05:00
Poojawa
01a7624ec2 fixes mam tail wag
fixes digi leg spawning
fixes ash drake range nomming
fixes spawner in alien nest
2018-09-20 01:56:46 -05:00
Poojawa
99e57fb221 various citadel tweaks/fixes
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
df7e625adb One day, while Bhjin was being lazy... 2018-09-11 13:03:53 -05:00
Poojawa
ec76f36099 plz fuck off with these map changes kthx 2018-09-11 12:51:45 -05:00
Poojawa
8a71a710dd One more, for the people in the back now y'all 2018-09-11 12:30:27 -05:00
Poojawa
4febd4aef0 comma boy kindly go the fuck away. 2018-09-11 12:19:18 -05:00
Poojawa
91fbd61e15 this is why you don't hand edit 2018-09-11 12:10:06 -05:00
Poojawa
1adc31ed26 Runtime station ain't worth the handfixin' 2018-09-11 12:08:51 -05:00
Poojawa
1d5c52ddf8 shit ain't pretty, but whatever cleaned 2018-09-11 12:01:21 -05:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa
fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
deathride58
45d0afb957 Merge pull request #7522 from nik707/armorynerfs
Nerfs the starting armory
2018-09-06 14:19:33 -04:00
deathride58
75bddc63d6 Merge pull request #7524 from nik707/pubby-changes
adds missing shutters to pubby
2018-09-03 13:44:01 -04:00
deathride58
95548530b3 Merge pull request #7526 from Tupinambis/TheSpareV2
Makes Spare more Accessible for heads (V2 because I forgot to compile the first time haha yes)
2018-09-03 13:43:31 -04:00
nik707
31215064ab fixes me being retarded 2018-09-01 18:42:04 -05:00
deathride58
c115c9dd96 Merge pull request #7503 from nik707/omega-changes
adds toxins to omega
2018-09-01 06:10:43 -04:00
Tupinambis
afcf52f5d8 This time it should actually work. I forgot to compile the first because I am an idiot haha yes. 2018-08-31 18:05:10 -05:00
nik707
6e087876e5 makes atmos more secure (#7513) 2018-08-31 12:41:37 -07:00
nik707
797ab5ea86 fixes shezzas ree 2018-08-31 14:15:07 -05:00
nik707
8d0b2966b8 changes starting armory loadout 2018-08-31 11:17:08 -05:00
nik707
da638407ab adds toxins to omega 2018-08-27 00:55:53 -05:00
deathride58
15fd819c29 Merge pull request #7476 from nik707/pubby-changes
fixes the fuckin backwards treadmills in the trash compactor
2018-08-23 03:48:36 -04:00
deathride58
c285261134 Merge pull request #7484 from nik707/boxchanges
changes maint areas near sec
2018-08-23 03:41:29 -04:00
Tupinambis
0e67143ca1 Removes the tesla coils from engineering secure storage, and places them within the engine room, functional upon being wrenched down. (Arranged in the common method of three coils on the left and right sides.) (#7445)
Reduces the width of engineering secure storage and its blast door by one tile. The machinery within has been rearranged in order to make the most commonly used machinery the most accessible.
2018-08-23 00:29:18 -07:00
Tupinambis
02a86dd2a0 New Alien Lavaland Ruin (#7455)
* Removes the old "xeno nest" lavaland ruin that currently is blacklisted on the live server, and replaces it with a new "alien nest" ruin.

* Tiny ruin description change.

* Removed all organs scattered around the nest, and replaced them with corpses you must harvest the organs from. Also slightly changes the loot and the locations of said loot.

Drone and Queen corpse spawners have been added.

* Removed xenomorph queen corpse, moved drone corpse into a location that is harder to cheese. Added "Hive's Blessing" (Syringe containing alien microbes.)
2018-08-23 00:26:32 -07:00
Tupinambis
a1bd981c7c Improves toxins by unbolting toxin chamber doors, and leaving the toxins air alarm unlocked at round start. Move pipes to a less obstructive location. Adds bomb hardsuit to box. (#7473) 2018-08-23 00:26:05 -07:00
nik707
f76127ffc2 changes maint areas near sec 2018-08-21 03:21:59 -05:00
deathride58
4cdd0177d8 Merge pull request #7407 from nik707/metachanges
Metachanges
2018-08-20 04:58:14 -04:00
nik707
b571c82b00 fixes small error 2018-08-20 03:12:43 -05:00
nik707
b061e44873 fixes the fuckin backwards treadmills in the trash compactor 2018-08-20 01:53:05 -05:00
Tupinambis
4b21b60269 Deep Storage Suit Loot Update. (Alternative to PR #7402) (#7449)
* Replaces syndicate hardsuit with mining hardsuit.

* adds jetpack
2018-08-16 13:02:11 -07:00
nik707
d8157e71e9 Merge branch 'master' into metachanges 2018-08-12 19:42:32 -05:00
deathride58
9dfc0eeb87 Merge pull request #7439 from Citadel-Station-13/sliding_puzzle_port
Manual mirror of sliding puzzles from /tg/, as a lavaland ruin, and an admin smite
2018-08-12 20:38:27 -04:00
nik707
7bd8907b9b Revert "adds secpod"
This reverts commit cdd37e268f.
2018-08-08 20:05:54 -05:00
kevinz000
4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
nik707
cdd37e268f adds secpod 2018-08-06 01:36:32 -05:00
nik707
fbf1774bc9 fix for command greytide 2018-08-06 00:30:09 -05:00
nik707
d23f0b23a3 Hopefully working re-merge of #7391 with some other minor tweaks (#7401)
* [s] Hopefully working re-merge of #7391

* pubby changes 2: electric boogaloo.

* another small fix

* adds missing camera

* extremely critical addition of a jukebox to pubby bar

* fucking missed a disposal pipe kill me <3

* fixes medbay disposals

* Update .gitignore
2018-08-03 19:32:19 -07:00
nik707
abd40802aa fixes medbay disposals 2018-08-01 19:45:56 -05:00
nik707
70fc9ce348 fucking missed a disposal pipe kill me <3 2018-07-31 14:32:32 -05:00