shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,142 Commits 5 Branches 0 Tags
3f1b7e4dd6fb32f21494639ee6b86de8a2ddf271
Commit Graph
221 Commits
Author SHA1 Message Date
kevinz000andGitHub e13efe26bd Merge pull request #8493 from Sishen1542/Oldstat 
Fixes THAT Oldstation Tile
 2019-06-08 01:08:44 -07:00
kevinz000andGitHub 8c632bed6f Merge pull request #8391 from Trilbyspaceclone/patch-132 
Gives pod lava land ruin a autolathen
 2019-06-08 01:00:41 -07:00
Sishen d7fdaed181 Fixes the Oldstation Tile 2019-05-30 15:45:17 -04:00
Useroth 90b62234d6 Made the hotel booze-o-mat hacked by default. 2019-05-22 20:13:58 +02:00
Useroth 9441853f6d Boltable hotel. Now with mapmerge. 2019-05-22 19:28:50 +02:00
TrilbyspacecloneandGitHub a68c40a1a0 Update lavaland_surface_seed_vault.dmm 2019-05-20 15:29:52 -04:00
TrilbyspacecloneandGitHub 9ff2132055 Update lavaland_surface_seed_vault.dmm 2019-05-18 12:52:59 -04:00
Poojawa e6597a192a Fixed duplicate turfs 2019-04-14 00:04:24 -05:00
Poojawa 29f4dfca83 Maps batch fixed 2019-04-13 23:30:22 -05:00
Poojawa e170f8523d Let's make sure the lava is also the same airmix too 2019-04-02 05:56:48 -05:00
Poojawa fc4659f503 Fixes deadly nest area 2019-04-02 05:45:12 -05:00
TrilbyspacecloneandGitHub b1205baa76 Update mrow_thats_right.dmm 2019-03-18 17:41:12 -04:00
deathride58andGitHub 1c7fc9c699 Merge pull request #8067 from Trilbyspaceclone/patch-67 
Makes Dinner for two have loot
 2019-03-08 20:44:23 -05:00
TrilbyspacecloneandGitHub 7edaff99de Update derelict2.dmm 2019-02-28 19:01:54 -05:00
TrilbyspacecloneandGitHub e84683330f Update derelict1.dmm 2019-02-27 16:20:46 -05:00
Tupinambisandkevinz000 58347dad9b Stop self antagging you shits (#7878) 2019-01-03 04:34:55 -08:00
Trilbyspacecloneandkevinz000 f2ae556ee4 Adds two boxes of candles to DEEP (#7851) 2018-12-31 03:06:50 -08:00
Tupinambis 828b631570 Increased Ash Walker resistances, makes them ash proof. Improves the Base. 2018-12-15 15:33:19 -06:00
Tupinambis 338a98972f Makes the ruin more of a challenge. 2018-11-16 22:34:34 -06:00
Tupinambis bfe8fda260 Makes hivebots more robust. Makes oldstation not have an excessive amount of hivebots. 2018-11-15 20:25:06 -06: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 fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
Tupinambisandkevinz000 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
Tupinambisandkevinz000 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
kevinz000 4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
deathride58 db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
Jordan Brownandletterjay c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
Cw 3040andkevinz000 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
LetterJayandGitHub 6d74717b39 Merge pull request #7158 from Citadel-Station-13/upstream-merge-38533 
[MIRROR] Adds dance machine, drink dispensers, flavor to beach bum ruin
 2018-06-18 12:27:45 -05:00
LetterJayandGitHub 78265ad51b Merge pull request #7144 from Citadel-Station-13/upstream-merge-38524 
[MIRROR] Fix some of the Lavaland roundstart atmos active turfs
 2018-06-18 10:10:49 -05:00
LetterJayandGitHub e298e283ee Merge pull request #7142 from Citadel-Station-13/upstream-merge-38504 
[MIRROR] Makes the xeno nest ruin harder to cheese.
 2018-06-18 10:10:07 -05:00
81Dentonandletterjay 241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533) 
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
 2018-06-18 09:37:48 -05:00
Tad Hardestyandletterjay 27b80045ad Fix some of the Lavaland roundstart atmos active turfs (#38524) 2018-06-17 03:15:08 -05:00
Dax Dupontandletterjay f5132ba0fc Makes the xeno nest ruin harder to cheese. (#38504) 
* Makes the xeno nest ruin harder to cheese.

* space
 2018-06-16 21:47:16 -05:00
81Dentonandletterjay e92060a3a9 Makes the caravan ambush ruin harder to cheese (#38509) 
* makes caravan ambush more challenging

* SMASH
 2018-06-16 15:38:34 -05:00
CitadelStationBotandkevinz000 0b362e017b [MIRROR] Lavaland Clock Cult Ruin (#7011) 
* Lavaland Clock Cult Ruin (#38263)

* Dead Ratvar

* tgm map

* Lavaland Clock Cult Ruin
 2018-06-05 11:16:55 -07:00
deathride58andkevinz000 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
CitadelStationBotandkevinz000 d62cb31e9b [MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile (#6884) 
* Delete some duplicate macro definitions

* sql changelog changes ping the host

* Templates the caravan ambush ruin shuttles

* Update CODEOWNERS

* Update components.dm

* Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile

* Initial Placeholder

* Update caravanambush.dmm
 2018-05-27 19:27:56 -07:00
deathride58andGitHub cee67a7706 Merge pull request #6760 from Citadel-Station-13/upstream-merge-37602 
[MIRROR] [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping
 2018-05-17 18:11:24 +00:00
iksypandletterjay 8dab7deb9a The crashed abductor ship is now fully deconstructable (#37834) 
* walls

*abductor lavaland ruin walls are now destructible

* just fucking uglify it

it saves me the hassle of having to subtype
 2018-05-17 10:32:55 -05:00
81Dentonandletterjay 0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
Jordan BrownandCitadelStationBot deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58andGitHub 2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
ArmhulenandCitadelStationBot 17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
Poojawa 0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
LetterJayandGitHub 8cdbc9ef5e Merge pull request #6452 from Citadel-Station-13/upstream-merge-37268 
[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-22 02:44:56 -05:00