shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,317 Commits 5 Branches 0 Tags
4fc30ce8ae92c22ddbb0fecea72d8b00a9ec9c68
Commit Graph

463 Commits

Author SHA1 Message Date
dapnee
5251c14f65 Letting that sink in 
idk why this was never fixed
 2023-01-13 16:59:27 -07:00
deathride58
ba8af5114e Merge pull request #15861 from shellspeed1/random-whiteship 
Ports random whiteships from tg
 2022-10-16 13:07:07 -04:00
shellspeed1
dfddbc23c3 ports https://github.com/tgstation/tgstation/pull/53603 Credit to TiviPlus 2022-09-22 01:10:08 -07:00
shellspeed1
95a775edf1 woopsie I forgot map stuff 2022-09-18 23:04:29 -07:00
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
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
TripleShades
af197ce22e lizard man points local mapper at the debug tools 
local mapper goes FUCKING BONKERS
 2022-03-29 02:12:32 -04:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Lin
d7cbb017f6 Fix few instances of bleeding white blood (#15398) 
* no longer bleed white blood

* parentheses man

* fix that one bdm map spawn too
 2022-01-09 17:23:48 +01:00
Chayse Ramsay
d1611ddf42 Lavaland ruin rad storm fix (#15242) 
* Lavaland rad storm fix

* whoops

* double whoops

* Update Lavaland.dmm
 2021-10-06 17:28:29 +02:00
zeroisthebiggay
41169d4366 helter skelter fixes so it doesn't break comms and does not come with a fucking uplink (#15210) 
* .

* .
 2021-09-27 17:49:01 +02:00
Emily
04284f8025 Un-Spaces the Library and also removes some leftover snow. 2021-09-02 20:11:49 +02:00
Artur
772bfaba75 line ending fuckery 2021-08-03 00:59:48 +03:00
silicons
c5438c73be Merge pull request #14879 from WanderingFox95/WanderingFox95-IcemoonRuinsOnLavaland 
[Review/Testmerge] Icemoon Ruins but on Lavaland!
 2021-07-29 22:39:42 -07:00
MrJWhit
26b186d24f Update engine_am.dmm 2021-07-06 16:29:45 -04:00
silicons
472fda9504 Merge pull request #14833 from zeroisthebiggay/finallytools 
TG Resprite Compendium Atomization Project | Episode Eight: The Finale: TG Tools
 2021-07-04 10:59:43 -07:00
Lin
2064da4842 Merge pull request #14887 from MrJWhit/teg-reinforced-floors 
Swapping some floors on the TEG-map
 2021-06-24 14:45:53 -07:00
MrJWhit
084ec04782 Update engine_sm_5x5.dmm 2021-06-23 12:51:30 -04:00
MrJWhit
b5e38ba4b3 Update engine_teg.dmm 2021-06-23 02:07:59 -04:00
WanderingFox95
74ae090f8f Now it shouldn't spawn plating around the shack. 
kinda ruins the immersion.
 2021-06-23 03:14:16 +02:00
WanderingFox95
2f801dd9a3 Not needed. Was just big and empty anyway. 2021-06-22 17:18:02 +02:00
WanderingFox95
f15a1d551c Miner in the mining site, no more underground needed. 2021-06-22 17:17:28 +02:00
WanderingFox95
130d617842 I missed two frozen tiles, woops. 2021-06-21 17:27:58 +02:00
WanderingFox95
0a136d9669 Adds safe ruins as lavaland ruins. 2021-06-21 16:38:41 +02:00
zerothebigboy
e0a311435b thetwentysecondofmany 2021-06-11 20:53:35 -04:00
MrJWhit
fe9fdf0975 Update lavaland_surface_alien_nest.dmm 2021-06-01 11:26:46 -04:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box 
Bark Box Remastered Edition
 2021-03-22 21:15:14 -06:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
ItzGabby
7121295935 finalfix??? 2021-03-19 03:08:10 -04:00
LetterN
2fe6125955 fixes this map 2021-03-15 22:16:49 +08:00
LetterN
a478555dbd mapfix 2021-03-15 21:02:50 +08:00
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
Letter N
69a054826b add art areas on meta, and adds lapvend on box,delta,meta. 
Other map changes are cosmetic.
 2021-03-10 16:34:37 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
Letter N
b3bfeb9858 it does not exist 2021-02-16 20:42:42 +08:00
SmArtKar
348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
silicons
efecc1804b Merge pull request #14114 from Hatterhat/fgs 
itt: i dont test my code again - free golem ship GPSes start disabled
 2021-01-25 22:59:09 -07:00
Hatterhat
95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
silicons
66874fe252 Merge pull request #14083 from shellspeed1/alternative-xeno-hive 
Removes the queen, and increases xeno variety in lavaland xenomorph ruin.
 2021-01-20 15:22:06 -07:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
Putnam3145
f7f9185073 Merge pull request #13826 from LetterN/semi-sync 
/tg/ ""hardsync"" part one of many*
 2021-01-19 17:22:05 -08:00
shellspeed1
450937a8f3 Update lavaland_surface_alien_nest.dmm 2021-01-18 15:27:40 -08:00
MrJWhit
4f49dab040 Update Mining_Station_Public_01.dmm 2021-01-18 01:57:05 -05:00
shellspeed1
bbd3fd54ba fixed map alteration I think 2021-01-17 19:44:18 -08:00
shellspeed1
eabecb1618 Revert "Reworks lavaland xeno ruin a bit" 
This reverts commit e8e92cb805.
 2021-01-17 18:07:48 -08:00
shellspeed1
e8e92cb805 Reworks lavaland xeno ruin a bit 2021-01-17 18:01:38 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00