Commit Graph

848 Commits

Author SHA1 Message Date
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
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
nik707
afa8003451 extremely critical addition of a jukebox to pubby bar 2018-07-29 12:20:10 -05:00
nik707
60ed121a58 adds missing camera 2018-07-26 14:19:14 -05:00
nik707
698727e18a adds a seemingly missing light to a dark corner in engineering 2018-07-25 19:38:18 -05:00
nik707
d41dd29a0d Revert "readds missing light in engineering"
This reverts commit 6b7a0f5eab.
2018-07-25 19:32:54 -05:00
nik707
6b7a0f5eab readds missing light in engineering 2018-07-25 19:31:48 -05:00
nik707
db7465910e another small fix 2018-07-23 18:44:44 -05:00
nik707
ae6d1b623a pubby changes 2: electric boogaloo. 2018-07-23 14:39:09 -05:00
nik707
31424150a6 [s] Hopefully working re-merge of #7391 2018-07-22 16:36:30 -05:00
Cw 3040
051735f245 Revert "reopens corridor between chem and rnd (#7391)"
This reverts commit 45ce574513.
2018-07-21 23:53:00 -04:00
nik707
45ce574513 reopens corridor between chem and rnd (#7391)
* pubbystationv1

This is a relatively minor change that reopens the central corridor between RND and Chemistry, each losing a negligable amount of space as a result. Will make navigating pubby a bit easier.

* removed mention of step_x
2018-07-21 18:32:26 -07:00
Letter N
e54cf2ce21 pubbypubbypubby 2018-07-07 22:05:04 +08:00
Letter N
c3bdd0f3bb omegaomegaomega 2018-07-07 22:03:55 +08:00
Letter N
e05ca517ad metametametagame 2018-07-07 22:02:45 +08:00
Letter N
084e8b4e00 deltadeltadelta 2018-07-07 22:01:49 +08:00
Letter N
958249ba03 boxboxbox 2018-07-07 22:00:46 +08:00
deathride58
8d8035950e Fixes centcom titlescreen resolution, finally 2018-07-05 04:23:12 -04:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
LetterJay
acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574
[MIRROR] Global component signals
2018-06-24 18:20:17 -05:00
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
Jordan Brown
2cd16aa1ad Fix some shuttle chair stuff (#38557)
* Fix shuttle chair stuff

* Remove redundancy
2018-06-19 01:29:17 -05:00
LetterJay
7ab66531bf Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539
[MIRROR] Adds New Shuttle Chairs
2018-06-18 21:58:42 -05:00
LetterJay
50da00b26c Merge pull request #7161 from Citadel-Station-13/upstream-merge-38540
[MIRROR] Cleans up supermatter related varedits
2018-06-18 21:58:15 -05:00