shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,164 Commits 5 Branches 0 Tags
4e62e076c8a6efe1776f013c3ac1572e36674792
Commit Graph

1167 Commits

Author SHA1 Message Date
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
kevinz000 2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
kevinz000 735fc5fab6 Merge pull request #8845 from Ghommie/Ghommie-cit121 
Tweaking the 🅱️ emoji icon.
 2019-07-14 03:35:33 -07:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000 1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125 
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
 2019-07-12 07:34:19 -07:00
kevinz000 b5cb68fc68 Merge pull request #8844 from Ghommie/Ghommie-cit120 
Fixes rocket launchers, buffing their accuracy etc.
 2019-07-09 08:30:44 -07:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Ghommie 9081b5b773 Revert "Fixes rocket launchers, buffing their accuracy etc." 
This reverts commit 1c6156dd0e.
 2019-07-08 07:17:49 +02:00
Ghommie 1c6156dd0e Fixes rocket launchers, buffing their accuracy etc. 2019-07-08 06:56:20 +02:00
kevinz000 d0a74ef331 Revert "Adds a can_inject check to IV Drips" 2019-07-07 02:29:49 -07:00
kevinz000 e62213a6cd Merge pull request #8775 from Ghommie/Ghommie-cit95 
crew monitor indexing pet peeve.
 2019-07-03 13:45:34 -07:00
kevinz000 7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42 
[Ready]Reskinnable PDAs.
 2019-06-28 20:30:05 -07:00
Ghommie f210e79f3f Slight tweaks to the crew monitor indexing. 2019-06-28 19:47:19 +02:00
kevinz000 f7bbca8918 Merge pull request #8731 from Ghommie/Ghommie-cit81 
Ports in microwave updates and its radial menu.
 2019-06-28 05:19:04 -07:00
deathride58 fb66d382fa Merge pull request #8727 from Ghommie/Ghommie-cit78 
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
 2019-06-28 00:47:09 -04:00
Ghommie 61a6d899d2 Should be ready. 2019-06-26 00:21:06 +02:00
Ghommie 67f00fc049 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42 2019-06-24 16:48:15 +02:00
kevinz000 294e1e48d2 Merge pull request #8659 from Ghommie/Ghommie-cit57 
ports "Componentizes orbiting"
 2019-06-23 06:50:32 -07:00
kevinz000 fc9a5415d8 Merge pull request #8678 from Sishen1542/SECMANBAD 
Fixes Plush Doll Loot [FOR REAL THIS TIME]
 2019-06-23 06:48:53 -07:00
Trilbyspaceclone d85a2f5f4a Update arcade.dm (#8675) 2019-06-23 05:59:35 -07:00
Ghommie 2e30b91567 Ports in microwave updates and its radial menu. 2019-06-23 06:10:49 +02:00
Ghommie 138535f9f6 Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines. 2019-06-22 23:15:51 +02:00
Sishen 95a6b5d7a9 Update arcade.dm 2019-06-17 14:35:24 -04:00
Sishen 96f0f0bd24 Update arcade.dm 2019-06-17 14:31:24 -04:00
kevinz000 1a6450a2e2 Merge pull request #8416 from Trilbyspaceclone/patch-135 
Gives sec EVA suits storge some Sec Jetpacks
 2019-06-16 19:35:05 -07:00
Ghommie b2d82bd1f1 Applying upstream fixes. 2019-06-17 00:27:07 +02:00
kevinz000 9c0cc52771 Merge pull request #8600 from Sishen1542/plushsalt 
Makes plushies not a 2% prize from the arcades
 2019-06-16 01:11:37 -07:00
BlackMajor 0294cba855 Merge pull request #8213 from Citadel-Station-13/kevinz000-patch-33 
shuttle purchase announcements are no longer delayed by mapload's blocking proccall
 2019-06-16 20:09:15 +12:00
Ghommie 79c4ce502e more pda skins. 2019-06-10 00:28:43 +02:00
Ghommie d2e216f2de tested fixed tested fixed tested. 2019-06-09 19:55:08 +02:00
Sishen 611aba583f Update arcade.dm 2019-06-09 03:07:22 -04:00
Ghommie 480ee9a9da Reskinnable PDAs. 2019-06-08 19:55:47 +02:00
kevinz000 b69986e544 Merge pull request #8514 from BurgerLUA/Arcade-Loot-Improvements 
Arcade Loot Improvements + Battlemachine Tweaks
 2019-06-08 03:53:13 -07:00
kevinz000 2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 
Ports in the container_type to reagents flags refactor.
 2019-06-08 01:26:28 -07:00
kevinz000 ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
kevinz000 2b3af1672c Merge branch 'master' into patch-135 2019-06-08 01:19:37 -07:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie 7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
BurgerLua c98d2ce5a0 nuke be gone 2019-06-02 15:21:45 -07:00
BurgerLua e7802a9b03 Arcade Loot Improvements 2019-06-02 02:02:47 -07:00
kevinz000 07d3b0361c Merge pull request #8466 from Poojawa/vis-overlay-insolence 
Fixes atmos and station alert consoles not updating visually
 2019-05-31 17:44:39 -07:00
Poojawa 333964fe02 Fixes atmos and station alert consoles not updating visually 2019-05-27 06:33:30 -05:00
BurgerLua e3aaff68b7 Added 2019-05-26 00:34:37 -07:00
deathride58 4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
Trilbyspaceclone 4da50828f7 Update suit_storage_unit.dm 2019-05-22 18:31:36 -04:00
kevinz000 e941901165 Merge pull request #8393 from WhiteHusky/sleeper-blood-levels 
Sleepers now show blood level and type for occupants.
 2019-05-20 23:34:38 -07:00
kevinz000 733bb498ca Merge pull request #8376 from Poojawa/oracle-cloning 
Ports Oracle's cloning tube
 2019-05-20 23:31:38 -07:00
Carlen White ccef9c326a Sleepers now show blood level and type for occupants. 
https://i.imgur.com/RaMjgt2.png

https://i.imgur.com/qkaBggM.png

Also updated TGUI package.json.

_This has been properly resigned with the correct key._
 2019-05-20 17:55:25 -04:00
Poojawa aeac0134ec Improves Recycler code by making it respect indestructable resistance 2019-05-17 07:33:24 -05:00