shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,922 Commits 5 Branches 0 Tags
ee1b04eefb0f005652df9040371b67383d6830dc
Commit Graph
113 Commits
Author SHA1 Message Date
ThalpyandGitHub 5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000andGitHub b292bc7187 Merge pull request #9007 from Ghommie/Ghommie-cit168 
Fixes and standarizes sword sheaths/scabbards overlays.
 2019-08-05 00:49:49 -07:00
Ghommie 06271dfcff aching special case. 2019-07-31 03:12:09 +02:00
Ghommie 991e4e8d41 Fixes and standarizes sword sheaths/scabbards overlays. 2019-07-31 02:43:40 +02:00
Ghommie 2b224400e3 Adds in worn overlays for different types of cuffs. 2019-07-29 04:31:27 +02:00
ThalpyandGitHub 9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
ThalpyandGitHub 696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
kevinz000andGitHub a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79 
Ports "Removes SSreligion"
 2019-06-28 20:30:44 -07:00
Fermi 3ccf300052 Fixed empty hypovial 2019-06-25 23:11:43 +01:00
Fermi 3928e027b4 Fixes (see dev discussion) 2019-06-25 23:06:55 +01: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
Ghommie 38bc8a4efd Ports "Removes SSreligion" 2019-06-23 01:45:21 +02:00
Ghommie 44a9fe9521 Fixes "Penlights Cannot Give Eye Exams" 2019-06-19 13:38:59 +02:00
Ghommie 480ee9a9da Reskinnable PDAs. 2019-06-08 19:55:47 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
deathride58andGitHub d40d9791c4 Merge pull request #8271 from Citadel-Station-13/kevinz000-patch-41 
the chaplain can now choose a weakened Eutactic energy sword as a holy weapon
 2019-05-21 08:06:21 -04:00
kevinz000andGitHub a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker 
[Ready]Makes a blue space bike horn HONK
 2019-05-20 23:40:17 -07:00
deathride58andGitHub 50bdbcc46f Merge branch 'master' into kevinz000-patch-41 2019-05-17 00:29:31 -04:00
kevinz000andGitHub 4190a00693 Update eutactic_blades.dm 2019-04-20 19:37:54 -07:00
kevinz000andGitHub b1d358ed79 Update eutactic_blades.dm 2019-04-20 19:26:53 -07:00
kevinz000andGitHub 22f72c6431 Update eutactic_blades.dm 2019-04-20 19:23:10 -07:00
Poojawa 30dbc57e75 Labcoats carry mk II hypos, kits hold more 2019-04-11 06:55:57 -05:00
TrilbyspacecloneandGitHub dcfbcbae6d woops forgot the moodlit 2019-03-28 19:49:50 -04:00
TrilbyspacecloneandGitHub 2ecc532c48 Update honk.dm 2019-03-28 19:40:28 -04:00
RagolutionandGitHub 890a23df52 Github client is shit. 
Ooga
 2019-03-14 00:16:11 -04:00
RagolutionandGitHub 8cc589b069 Actually fixes the thing. 
Turns out this was 100% easier to fix than I thought.
 2019-03-14 00:03:37 -04:00
LetterJay 0015e806ab donation item 2019-01-13 02:36:15 -06:00
Poojawa d429eb67cd remodularize vtec code 
Works as expected now but, combat rework meme jog/spring override speeds
 2018-10-20 07:19:19 -05:00
Poojawa 1d6355534c Unmodularizes vtech controls 
I swear most of this shit just doesn't work in modularization anymore.
 2018-10-20 04:18:09 -05:00
Poojawa f34d94cd4d pretty much all modular code seems to turbo break 2018-10-13 00:39:28 -05:00
deathride58andGitHub 212187620b Merge pull request #7599 from Poojawa/override-override 
Digitigrade Uniforms from Oracle
 2018-09-29 21:30:12 -04:00
Poojawa f2faf66586 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into modular_cit_cleaning 2018-09-28 22:09:19 -05:00
Poojawa 2daa197605 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into override-override 2018-09-27 05:09:23 -05:00
Poojawa 4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
izzyinboxandkevinz000 9a98b92c58 fixes tennis ball equip slots (#7582) 2018-09-26 12:16:13 -07:00
Poojawa 4efdf4b0b3 Cleans up Modular_citadel 
Yes I know it'll have merge conflicts later.
 2018-09-21 03:52:13 -05:00
Poojawa 7d300117af literally everything Bhjin has been complaining about 
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
 2018-09-18 03:59:46 -05:00
Poojawa dc9fd6db12 readds V-tech control, modularized properly 2018-09-17 22:35:43 -05:00
deathride58andkevinz000 4208d6ea5f Adds boombox donor item for Raiq/chefferz (#7368) 2018-08-03 19:29:19 -07:00
Bear 586d3a3456 super minor fix 2018-07-18 01:22:56 -04:00
Letter NandGitHub 5c79a794ec Update holy_weapons.dm 2018-07-06 17:20:30 +08:00
Letter NandGitHub bff55cc362 Update handcuffs.dm 2018-07-06 17:19:56 +08:00
deathride58andGitHub cec2871db2 Merge pull request #7293 from LetterN/patch-4 
fixes kinkmate
 2018-07-06 01:36:15 -04:00
deathride58 f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
Letter NandGitHub 493a356338 Update machine_circuitboards.dm 2018-07-02 09:13:28 +00:00
deathride58andGitHub 4d79c5ef09 Merge pull request #7110 from Michiyamenotehifunana/Random-Donator-Thing-1 
Adds the Not-Nanotrasen Corporate Uniform and a Silver Bike Horn
 2018-06-26 14:06:32 -04: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
Letter NandGitHub 5813950aff fixes shock collars 2018-06-18 14:28:43 +08:00
Michiyamenotehifunana e4e0e0d91d Adds random things for Jay to do things with 2018-06-15 13:50:15 +08:00