shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,306 Commits 5 Branches 0 Tags
48433fa6df474c78b7568ccf63583aebbb44680a
Commit Graph
16306 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 48433fa6df Fixes Several Machines Materials Insertion 2018-05-04 04:40:56 -05:00
Fox McCloudandCitadelStationBot f5031bc4f7 Fixes Several Machines Materials Insertion (#37432) 
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
 2018-05-04 04:40:56 -05:00
LetterJayandGitHub f27088a346 Merge pull request #6639 from deathride58/fuckinmetagamers 
Fixes an OOC exploit that reveals the gamemode
 2018-05-03 20:36:15 -05:00
deathride58 288c61b1c1 obfuscates the gamemode in topic() calls 2018-05-03 21:14:15 -04:00
CitadelStationBotandGitHub d574fc5590 Merge pull request #6622 from Citadel-Station-13/upstream-merge-37289 
[MIRROR] Science can now print off processors as well
 2018-05-03 09:07:59 -05:00
CitadelStationBotandGitHub 4dc647d8ff Merge pull request #6626 from Citadel-Station-13/upstream-merge-37595 
[MIRROR] Plasmamen organs GET sprites!
 2018-05-03 09:02:15 -05:00
CitadelStationBotandGitHub a351edea90 Merge pull request #6625 from Citadel-Station-13/upstream-merge-37414 
[MIRROR] Removes stock market
 2018-05-03 09:01:12 -05:00
LetterJayandGitHub 25b3828100 Merge pull request #6624 from Citadel-Station-13/upstream-merge-37609 
[MIRROR] Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes)
 2018-05-03 08:54:01 -05:00
LetterJayandGitHub 71e7b461d5 Merge pull request #6623 from Citadel-Station-13/upstream-merge-37615 
[MIRROR] Fixes Midori cigs having no nicotine
 2018-05-03 08:52:46 -05:00
CitadelStationBot efc9680358 Plasmamen organs GET sprites! 2018-05-02 21:21:11 -05:00
ArmhulenandCitadelStationBot 04057dc7d6 Plasmamen organs GET sprites! (#37595) 
* DONE

* initial

* Removes random slashes
 2018-05-02 21:21:11 -05:00
pigeonsandCitadelStationBot 2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
CitadelStationBot c23bdf84bb Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) 2018-05-02 17:31:22 -05:00
Grandmother of 50andCitadelStationBot d09ae95d42 Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) (#37609) 
* Update alcohol_reagents.dm

* removes period
 2018-05-02 17:31:22 -05:00
CitadelStationBot 1eadb0a838 Fixes Midori cigs having no nicotine 2018-05-02 17:31:14 -05:00
MickyanandCitadelStationBot 5596472fc1 fixes midori cigs being empty (#37615) 2018-05-02 17:31:14 -05:00
CitadelStationBot dee8fec8aa Science can now print off processors as well 2018-05-02 16:12:28 -05:00
Grandmother of 50andCitadelStationBot 26fa3e1d12 Update machine_designs.dm (#37289) 2018-05-02 16:12:28 -05:00
deathride58andGitHub e42cce26da Merge pull request #6619 from Citadel-Station-13/upstream-merge-37538 
[MIRROR] Animated Spellbooks
 2018-05-02 17:33:41 +00:00
deathride58andGitHub 184441eb38 Merge pull request #6078 from Commandersand/LOADOUT 
MORE LOADOUT STUFF
 2018-05-02 17:29:44 +00:00
CitadelStationBot 9f8f630653 Animated Spellbooks 2018-05-02 10:35:57 -05:00
Nabski89andCitadelStationBot b71e8718eb Animated Spellbooks (#37538) 2018-05-02 10:35:57 -05:00
deathride58andGitHub 9a5fd92fb4 Merge pull request #6491 from Citadel-Station-13/upstream-merge-37343 
[MIRROR] Adds more roundstart tips
 2018-05-02 14:29:06 +00:00
deathride58andGitHub c3a58dbc2a Merge branch 'master' into upstream-merge-37343 2018-05-02 14:28:53 +00:00
deathride58andGitHub 5098e0db21 Merge pull request #6490 from Citadel-Station-13/upstream-merge-37381 
[MIRROR] Fixes toolbelts holding everything
 2018-05-02 14:27:25 +00:00
deathride58andGitHub f5cbfd1c52 Merge pull request #6577 from Citadel-Station-13/upstream-merge-36839 
[MIRROR] Deactivate suicide prescans via ghost var
 2018-05-02 14:25:32 +00:00
deathride58andGitHub d2804694e0 Merge pull request #6618 from Citadel-Station-13/upstream-merge-37606 
[MIRROR] Corrects mistake in storage implant uplink description
 2018-05-02 14:25:14 +00:00
deathride58andGitHub 711f309c46 Update suicide.dm 2018-05-02 10:01:47 -04:00
deathride58andGitHub 55566461c6 Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565 
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
 2018-05-02 13:59:14 +00:00
deathride58andGitHub d7c709f5a6 Merge pull request #6616 from Citadel-Station-13/upstream-merge-37035 
[MIRROR] Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too
 2018-05-02 13:58:29 +00:00
CitadelStationBot 421379ea76 Corrects mistake in storage implant uplink description 2018-05-02 08:38:10 -05:00
Jordan BrownandCitadelStationBot 0a0875e447 Merge pull request #37606 from ShizCalev/storage-implant-uplink-description 
Corrects mistake in storage implant uplink description
 2018-05-02 08:38:09 -05:00
CitadelStationBot b23230293e Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too 2018-05-02 01:32:34 -05:00
vuonojenmustaturskaandCitadelStationBot 49150c542f Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too (#37035) 
* APC crap

* moar define

* honk

* cover defines
 2018-05-02 01:32:34 -05:00
deathride58andGitHub f35bfa22e4 Merge pull request #6614 from Citadel-Station-13/upstream-merge-37475 
[MIRROR] H.O.G.A.N. lawset
 2018-05-02 01:33:19 +00:00
deathride58andGitHub 9151a80461 Merge pull request #6613 from Citadel-Station-13/upstream-merge-37590 
[MIRROR] Reorganizes cargo's big "miscellaneous supplies" category
 2018-05-02 01:32:40 +00:00
deathride58andGitHub 4d44701ee5 Merge pull request #6612 from Citadel-Station-13/upstream-merge-37580 
[MIRROR] Craftable HUDsunglasses
 2018-05-02 01:32:01 +00:00
deathride58andGitHub 5c40a38457 Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584 
[MIRROR] Readds missing nuked narsie cinematic.
 2018-05-02 01:30:19 +00:00
deathride58andGitHub a84f5c5328 Merge pull request #6608 from Citadel-Station-13/upstream-merge-37516 
[MIRROR] Changes the trauma formula so constant small ticks don't keep triggering traumas
 2018-05-02 01:30:00 +00:00
deathride58andGitHub f248685db2 Merge pull request #6607 from Citadel-Station-13/upstream-merge-37579 
[MIRROR] Fix placing boxes in storage implants
 2018-05-02 01:29:41 +00:00
deathride58andGitHub 084f2ac1da Merge pull request #6606 from Citadel-Station-13/upstream-merge-37593 
[MIRROR] Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
 2018-05-02 01:29:15 +00:00
deathride58andGitHub 5f6673ca4d Merge pull request #6605 from Citadel-Station-13/upstream-merge-37570 
[MIRROR] Fixes mapping issue on deltastation
 2018-05-02 01:28:34 +00:00
deathride58andGitHub a4b48cdc53 Merge pull request #6604 from Citadel-Station-13/upstream-merge-37562 
[MIRROR] Fix runtimes in corpse code due to mob_spawners becoming null
 2018-05-02 01:28:05 +00:00
deathride58andGitHub 2b8e734488 Merge pull request #6603 from Citadel-Station-13/upstream-merge-37560 
[MIRROR] Fix mecha maintenance protocol button always saying Initiate
 2018-05-02 01:27:51 +00:00
deathride58andGitHub f49c9d7e3d Merge pull request #6602 from Citadel-Station-13/upstream-merge-37561 
[MIRROR] Fixes loading custom aways.
 2018-05-02 01:27:26 +00:00
deathride58andGitHub 613fadf057 Update _concrete.dm 2018-05-01 21:27:01 -04:00
deathride58andGitHub fa5db57b56 Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568 
[MIRROR] Removes enriched uranium
 2018-05-02 01:26:27 +00:00
deathride58andGitHub 2760c61720 Merge pull request #6599 from Citadel-Station-13/upstream-merge-37572 
[MIRROR] Fixes the intergalactic stock market crash by removing the speculation/performance modifier
 2018-05-02 01:26:05 +00:00
deathride58andGitHub 8f00bca017 Merge pull request #6598 from Citadel-Station-13/upstream-merge-37477 
[MIRROR] Makes dizziness work again
 2018-05-02 01:25:46 +00:00
deathride58andGitHub 9c1a4303f9 Merge pull request #6597 from Citadel-Station-13/upstream-merge-37510 
[MIRROR] Circuits can't throw themselves
 2018-05-02 01:25:23 +00:00