Commit Graph

194 Commits

Author SHA1 Message Date
Tupinambis e45fde5fa0 Ensures the air injectors in toxins and more importantly the SM engine actually function. 2018-11-18 17:01:16 -06:00
Tupinambis addda0398f Tesla died for our sins. 2018-11-11 20:04:22 -06:00
Tupinambis 4d644153d2 Adds Cryobeds to perma 2018-10-19 20:12:51 -05:00
nik707 dcd5141d9b fixes various map bugs PASS1 2018-10-08 12:54:56 -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 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 1d5c52ddf8 shit ain't pretty, but whatever cleaned 2018-09-11 12:01:21 -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
nik707 31215064ab fixes me being retarded 2018-09-01 18:42:04 -05: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 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
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
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 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 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
nik707 7bd8907b9b Revert "adds secpod"
This reverts commit cdd37e268f.
2018-08-08 20:05:54 -05: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 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 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
deathride58 db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
Cw 3040 27b6ebc612 Cw's Spaceruins, Maintbar and Kegspawn changes (#7141)
* Station Changes

-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)

* Space Ruins Changes

-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves

* Kegspawn Change

Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)

* Small MetaStation Fixes

Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
2018-06-18 11:52:11 -07:00
Jordan Brown ce66967811 Merge pull request #38521 from AutomaticFrenzy/patch/pubby
Fix protolathe in Pubby circuit lab
2018-06-18 09:39:14 -05:00
pubby 1b5fc0d705 Fix security disposals on pubby and a few other things (#38481)
* Fix security disposals on pubby and a few other things

* Also fix floating grilles on pubby's east solar array
2018-06-16 06:19:01 -05:00
Cw3040 d5e3001261 Changes
This should fix Travis's issue.
2018-06-07 21:14:21 -04:00
Cw3040 45ec368d76 Pubby Changes
-Added Cryogenics
-Kinkmates, of course.
-Keg in maint bar
2018-06-07 20:53:15 -04:00
81Denton e3f9229e08 Fixes Pubby maint boozeomat (#38300) 2018-06-06 02:36:34 -05:00
LetterJay 5997b69de1 Merge pull request #6995 from Citadel-Station-13/upstream-merge-38240
[MIRROR] Replaces airlock_controller/incinerator related varedits with defines/subtypes
2018-06-05 12:11:34 -05:00
81Denton 0d42b1c4d1 Replaces airlock_controller/incinerator related varedits with defines/subtypes 2018-06-03 11:03:14 -05:00
theo2003 b9ac5c0544 Roboticists now have access to open the R&D windoors. (#38226) 2018-06-03 09:03:42 -05:00
LetterJay 3b498f2288 map fix 2018-06-02 05:41:31 -05:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
81Denton 5ed28b5cd2 Adds "proper" solar/gold/silver crates (#37890)
* adds solar/gold/silver crates

* replaces pubbystation crates

* hhhh

* forgot adding spaces

* travis pls
2018-05-19 02:14:00 -05:00
Jordan Brown 3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
LetterJay f387bb1694 Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622
[MIRROR] Changes cockroach guts to insect guts
2018-05-05 09:40:11 -05:00
Jordan Brown deddd8debe Merge pull request #37622 from ShizCalev/cockarock
Changes cockroach guts to insect guts
2018-05-03 08:42:46 -05:00