shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,060 Commits 5 Branches 0 Tags
cae30f90ad8bbeaddcfe042f0f0d88bf6a28107d
Commit Graph

19060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nik707
cae30f90ad Merge pull request #7799 from R3dtail/new_carpet 
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
 2018-12-10 16:45:38 -06:00
nik707
1960947d25 Merge pull request #7803 from Trilbyspaceclone/patch-23 
Adds in white crayons to art crate.
 2018-12-10 16:44:25 -06:00
nik707
971ba21931 Merge pull request #7802 from Citadel-Station-13/kevinz000-patch-21 
the one item designed to hard counter kudzu no longer takes 1/2 of your stamina bar to take down one block of fireproofing kudzu
 2018-12-10 16:43:03 -06:00
Trilbyspaceclone
3e736dcdf2 adds in white crayons 2018-12-08 17:19:13 -05:00
Redtail
4c7075f1a8 New medals added. 
add:  Two new medals for engineering and medical to give out.
 2018-12-08 12:12:36 -06:00
kevinz000
d049ecaecd Update hydroitemdefines.dm 2018-12-08 04:53:02 -08:00
kevinz000
a347cd14e2 eh 2018-12-08 04:19:41 -08:00
kevinz000
a2f9135951 Update hydroitemdefines.dm 2018-12-08 04:16:04 -08:00
Redtail
629189fdc1 Added Another new carpet, and two tables, and a new cargo crate. 
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
 2018-12-07 22:48:46 -06:00
Ragolution
1a2a8ec6ae Citadel: The Forgotten Sweaters (#7786) 
Wakes up the sleeping Sweaters hidden in turtlenecks.dm
 2018-12-06 20:57:48 -08:00
nik707
bce54df085 Merge pull request #7785 from Qfunk4d/patch-3 
Update chat_commands.dm
 2018-12-06 00:02:25 -06:00
CitadelStationBot
2e675089a8 Automatic changelog generation for PR #7791 [ci skip] 2018-12-05 23:59:34 -06:00
nik707
100328f823 Merge pull request #7791 from deathride58/fixeswavedashing 
Nerfs wavedashing
 2018-12-05 23:59:31 -06:00
deathride58
b230f1a1ea Fixes wavedashing 2018-12-05 19:49:14 -05:00
Trilbyspaceclone
17b5a6061a Cargo Hardsuit Packets as well as a pare of soft suits (DPO) (#7767) 
* Hardsuits and a set of softs

* Ups sec suit to 3000 do to it being a sec suit

* DropPodOnly!

* Woops

* Kev wishes
 2018-12-04 18:14:04 -08:00
Trilbyspaceclone
dd0dfb7517 Buffs COC and Capo sword (#7762) 
* buffs COC and Capo sword

* Update misc.dm
 2018-12-04 08:09:52 -08:00
deathride58
6ec059ecfa Merge pull request #7784 from nik707/buildmode 
Fixes buildmode, probably.
 2018-12-04 00:29:02 -05:00
Qfunk4d
cfc74acc48 Update chat_commands.dm 
even more new words
 2018-12-03 19:49:20 -07:00
deathride58
6c5694ce0c Merge pull request #7780 from Ignari-Coldstorm/Premium-KPA 
Adds a new PKA to the mining Vendor
 2018-12-03 11:20:37 -05:00
CitadelStationBot
0ae4351293 Automatic changelog generation for PR #7782 [ci skip] 2018-12-03 09:54:43 -06:00
nik707
8589eb3650 Merge pull request #7782 from deathride58/longbonespears 
Buffs bone spears by increasing their reach to 2 whole tiles
 2018-12-03 09:54:39 -06:00
CitadelStationBot
325b6fb323 Automatic changelog generation for PR #7781 [ci skip] 2018-12-03 07:24:25 -06:00
nik707
e4c11cbfa4 Merge pull request #7781 from deathride58/fixesstaminahudbutton 
Fixes the stamina hud button - makes it possible to actually click the stamina hud button and fixes the stamina buffer stats displayed by the stamina hud button
 2018-12-03 07:24:22 -06:00
CitadelStationBot
dfb26da4f9 Automatic changelog generation for PR #7783 [ci skip] 2018-12-02 21:52:05 -06:00
nik707
036757488d Merge pull request #7783 from R3dtail/new_carpet 
Added a new carpet
 2018-12-02 21:52:03 -06:00
nik707
23b7795039 untested lmao 2018-12-02 19:47:38 -06:00
R3dtail
fdaf7c3ac1 Added back in the t 
Don't know what happened to the T.  But it's back now!
 2018-12-02 13:35:56 -06:00
Redtail
e339bcd2ca Added a new carpet 
Worked on adding a new carpet.  It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
 2018-12-01 20:21:18 -06:00
nik707
2f79c609a5 Merge pull request #7777 from Citadel-Station-13/kevinz000-patch-13 
Rebuffs reactive armor because giving the repulse (!!!) armor 20 seconds and the nerfed tesla armor (!!!) 15 seconds is pretty stupid.
 2018-12-01 19:49:34 -06:00
CitadelStationBot
58b900fb0e Automatic changelog generation for PR #7779 [ci skip] 2018-12-01 19:49:24 -06:00
nik707
c6521a725f Merge pull request #7779 from deathride58/buffednightvision 
Buffs and nerfs night vision trait - makes the night vision trait expand your darksight to 7 tiles but increases the night vision trait's lighting plane alpha from 245 to 250
 2018-12-01 19:49:21 -06:00
Ignari_Coldstorm
747f5a0a4e Update machine_vending.dm 2018-12-01 17:57:04 -06:00
nik707
4c0e2ee27b Merge pull request #7747 from Citadel-Station-13/kevinz000-patch-11 
[s] killer tomato logging
 2018-11-30 21:53:39 -06:00
CitadelStationBot
afdf7fd177 Automatic changelog generation for PR #7765 [ci skip] 2018-11-30 21:52:40 -06:00
nik707
68bf6098bf Merge pull request #7765 from deathride58/cultbuffs 
Cult buffs (Makes most cult whispers not be shouted and makes stun spell guarantee stamcrit at the cost of a higher cost and reduced charges)
 2018-11-30 21:52:38 -06:00
CitadelStationBot
3df8c04499 Automatic changelog generation for PR #7776 [ci skip] 2018-11-30 21:50:06 -06:00
nik707
8e8d77d4c4 Merge pull request #7776 from Tupinambis/OmegaTextureFix 
Replaces all missing texture turf on Omega Station with sandy plating as was intended.
 2018-11-30 21:50:04 -06:00
CitadelStationBot
70a1d1e175 Automatic changelog generation for PR #7778 [ci skip] 2018-11-30 21:47:55 -06:00
nik707
33852b5087 Merge pull request #7778 from deathride58/letstryfixingthefuckingstaminabug 
lets try fixing the fucking stamcrit bug - removes redundant update_stamina() calls and moves update_stamina() calls outside of if clauses
 2018-11-30 21:47:53 -06:00
deathride58
fd000f7fb8 makes bone spears capable of reaching two whole tiles! 2018-11-30 21:41:19 -05:00
deathride58
dc8d7dee17 makes it actually possible to click the stamina button on the hud and fixes the stambuffer displayed by the button 2018-11-30 21:31:43 -05:00
Ignari_Coldstorm
55517ae329 Adds a new PKA to the mining Vendor 
Miners are always going and saying that they amass so many points while mining, yet nothing is worthwhile enough to buy with said points so they sit there wasted usually. This adds a new premium Kinetic Accelerator with stronger base stats, meanwhile it costs 8K mining points. Will later be adding premium edition of Kinetic crusher. Ideal goal is to encourage miners to mine enough ore for station to get this gear before they go out to hunt for real.
 2018-11-30 20:18:49 -06:00
deathride58
9f294f523e buffs and nerfs night vision trait 2018-11-30 20:36:27 -05:00
Trilbyspaceclone
61659a5bac Buffs RPE and nerfs BSRPEs (#7766) 
* Buffs RPE and nerfs BSRPEs

* half way
 2018-11-29 22:50:16 -08:00
CitadelStationBot
662ffa7a36 Automatic changelog generation for PR #7771 [ci skip] 2018-11-29 17:03:25 -06:00
deathride58
273c6de5ba gets rid of the hardcoded "you remember the guy who flashed you" thing in revs, replaces it with something more in-line with the rest of the antags (#7771) 2018-11-29 15:03:23 -08:00
deathride58
c56cf7885d lets try fixing the fucking stamina bug - removes redundant update_stamina() calls and moves update_stamina() calls outside of if clauses 2018-11-29 12:35:01 -05:00
kevinz000
63bf5c54e1 Update reactive_armour.dm 2018-11-28 21:21:48 -08:00
kevinz000
02ec7a38ce Update reactive_armour.dm 2018-11-28 21:16:30 -08:00
kevinz000
a6d9a4f721 Update reactive_armour.dm 2018-11-28 21:14:30 -08:00