Commit Graph

65 Commits

Author SHA1 Message Date
shellspeed1 d9e15776ee Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) (#15847)
* sprites and sounds

* The code for the reactor itself

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Map stuff

* Removes Clamps.

* Matrices separated, this was a mistake on my part.

* Update tgstation.dme

* removal as per putnam's review

* redfines highest available as 1007

* possible soundloop fix? probably not.

* temporary config thing to make engine load

* changes to map template from splurt

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* actually somehow fixed the runtimes?

* old maps from hyper, not needed..

* Revert "old maps from hyper, not needed.."

This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.

* take two on removal

* fixes power output

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* deals with the double turf

* Revert "temporary config thing to make engine load"

This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.

* was told to bring it back

* don't need to change these

* next time I'll just copy paste it instead of type it.

* a

* Flexi Seal crate so we can fix the reactor

* set power to 0 so it can be fixed

* nerfs power output

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2022-09-17 13:33:51 -07:00
shellspeed1 288320029a adds a sink to the kitchen 2022-08-25 22:30:36 -07:00
shellspeed1 aa107bdce1 tweaks based on testing and feedback. 2022-08-24 22:32:17 -07:00
shellspeed1 cade664a0c removed insulated gloves and electric toolbox as they are no longer needed 2022-08-24 16:08:41 -07:00
shellspeed1 bbffaa61df removed access restriction on hydroponics locker 2022-08-24 15:49:05 -07:00
shellspeed1 e628f17e7a minor tweak to penthouse bathroom mirror 2022-08-24 15:28:51 -07:00
shellspeed1 2f82dfed9d fixes missing windoor 2022-08-24 15:13:01 -07:00
shellspeed1 3888cf602e removed duplicate stack of coal from garden pod 2022-08-24 15:12:27 -07:00
shellspeed1 3afb008bd6 fixes loose variable 2022-08-21 23:19:38 -07:00
shellspeed1 98658fe14a a 2022-08-21 23:18:02 -07:00
shellspeed1 4de90f71d8 forgot to add this. 2022-08-21 23:10:31 -07:00
shellspeed1 937393dfdb made bookshelves passable 2022-08-21 23:04:39 -07:00
shellspeed1 f030d0038f New garden pod 2022-08-21 05:00:26 -07:00
shellspeed1 1ea6e3210e Additional fixes, some cleanup 2022-08-21 04:59:59 -07:00
shellspeed1 7e9f760177 Update shelter_5.dmm
cleaning up a mistake
2022-08-21 03:31:04 -07:00
shellspeed1 f0a448e4e1 Update shelter_5.dmm
pod tweaks
2022-08-21 01:37:55 -07:00
shellspeed1 08566dbe87 Update shelter_5.dmm
penthouse pod update
2022-08-21 01:17:08 -07:00
shellspeed1 5eff532b03 Woops, lets fix that 2021-07-09 01:12:10 -07:00
shellspeed1 d6b69b2800 The actual map 2021-06-27 03:39:21 -07:00
shellspeed1 5d873cd215 lets see if this fixed that 2021-05-17 01:33:19 -07:00
shellspeed1 d76a0eed04 woops forgot map merge, lets fix that 2021-05-17 01:26:36 -07:00
shellspeed1 e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
silicons 7a95e464a7 Update hilbertshotel.dmm 2020-12-13 18:55:23 -07:00
Detective Google ddc9b9d184 yeet 2020-10-06 01:23:29 -05:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
BlackMajor b811d3e57e More work on it 2019-12-30 01:23:41 +13:00
Ghom 3203441abe Nope, it didn't compile, Harold. 2019-12-26 15:48:46 +01:00
Hatterhat 940efc0c1c holy shit i hope this compiles 2019-12-26 01:46:04 -06:00
Ghommie 5142faa353 local xmas tree almost ruins PR. 2019-06-16 11:07:16 +02:00
Ghommie ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02:00
Poojawa e6597a192a Fixed duplicate turfs 2019-04-14 00:04:24 -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 ec76f36099 plz fuck off with these map changes kthx 2018-09-11 12:51:45 -05:00
Poojawa fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Jordan Brown de896c2929 Merge pull request #37206 from AutomaticFrenzy/patch/pixel-z
Correct some pixel_z issues
2018-04-15 22:23:58 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Poojawa 6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
Poojawa 7d488e8f4c Citadel'd Maps from #5523 (#5551)
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
2018-02-17 18:04:28 -06:00
ExcessiveUseOfCobblestone 745ca227c3 Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities (#35427)
* Update portable_turret.dm

* Update portable_turret.dm

* Update portable_turret.dm

* f
2018-02-13 20:47:14 -06:00
Jordan Brown ebd82bfe50 Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2
Actually fixes broken accesses
2018-02-11 15:48:40 -06:00
CitadelStationBot 65f026c3ee [MIRROR] Mark pirate ship docking port non-timid (#5306)
* Mark pirate ship docking port non-timid

* Update pirate_ship.dmm

* Update pirate_ship.dmm
2018-02-05 05:35:17 -06:00
CitadelStationBot 5385333a64 Fixes some broken accesses (#5287) 2018-02-05 02:25:16 -06:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Leo b59c8c6e71 Merge pull request #34581 from ShizCalev/stacked-turf-cleanup
Corrects some stacked turf
2018-01-19 08:16:31 -06:00
oranges c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-16 14:37:26 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
uraniummeltdown d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
ShizCalev cf06a8142e Cleans up template shuttles (#32932)
* Cleans up template shuttles

* More turf
2017-11-21 22:28:39 -06:00
WJohn e8ddae5d98 Cleans up floors.dmi a bit and adds new turf decals. 2017-11-20 20:48:06 -06:00