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

7131 Commits

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
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
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
deathride58
6ec059ecfa Merge pull request #7784 from nik707/buildmode 
Fixes buildmode, probably.
 2018-12-04 00:29:02 -05: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
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
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
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
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
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
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
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
kevinz000
20553efea5 Update tomato.dm 2018-11-28 19:52:01 -08:00
deathride58
fb704afb61 makes gloves of the northstar restore 2/3 of the stamina used up by harm intent punches on empty stam buffers (#7770) 2018-11-28 19:47:34 -08:00
nik707
60828a2da0 Merge pull request #7754 from deathride58/fixesghostrolesforreal 
actually fixes ghost role spawners leaving null entries in mob_spawners
 2018-11-26 04:10:10 -06:00
deathride58
6699d2fce6 Merge pull request #7718 from Citadel-Station-13/kevinz000-patch-13 
adds proper facename/coordinates to R&D logs
 2018-11-25 07:17:03 -05:00
deathride58
6177fabebd buffs cult by making the majority of their spells be whispered instead of shouted and makes stun talisman stamcrit 2018-11-24 18:08:14 -05:00
nik707
fd2e9ad5c0 Merge pull request #7753 from Trilbyspaceclone/Trilbyspaceclonepatch-6 
Makes skeletal no longer KPA proof, but Pirate skeletal are still do to being Free or something
 2018-11-23 15:12:19 -06:00
nik707
fd45662aaf Merge pull request #7746 from Citadel-Station-13/kevinz000-patch-9 
"Why did I set piercing to two instead of one" and other miscellaneous beam rifle rebalances
 2018-11-23 15:10:13 -06:00
nik707
1110a9449a Merge pull request #7748 from deathride58/buffedcacti 
buffs lavaland's cacti just a smidge by increasing the amount of vitfro they have by 1.5x (4 > 6)
 2018-11-23 15:05:45 -06:00
nik707
df2048ef6b Merge pull request #7745 from Citadel-Station-13/kevinz000-patch-7 
Fixes nanite Metabolic Synthesis
 2018-11-23 15:05:02 -06:00
nik707
7cd129dc1a Merge pull request #7750 from deathride58/skintonedgenitals 
Fixes the "genitals use skintone" option not appearing in the character appearance menu
 2018-11-21 15:38:14 -06:00
Trilbyspaceclone
bf4f9197dd So we can see them 2018-11-20 22:34:11 -05:00
deathride58
73ae6badb6 actually fixes ghost role spawners leaving null entries in mob_spawners 2018-11-20 22:24:47 -05:00
nik707
bea7b2a09f Merge pull request #7698 from Trilbyspaceclone/Cargo_memes_1 
[Ready] More riot gear, cap pen and more!
 2018-11-20 19:14:59 -06:00
Trilbyspaceclone
cd7ae39e04 Readdes skeles 2018-11-20 20:06:48 -05:00
Trilbyspaceclone
810f7f186d Headset sorrow 2018-11-20 19:37:13 -05:00
Trilbyspaceclone
66b5f06514 Grammar 2018-11-20 16:39:01 -05:00
kevinz000
611bdad58e Update tomato.dm 2018-11-20 10:57:56 -08:00
nik707
54506f6b2c Merge pull request #7742 from deathride58/yallnwahsdontevensmokeweed 
Y'all n'wahs aint even smoke - adds skooma
 2018-11-20 12:14:09 -06:00
deathride58
125b653cf8 fixes genitals use skintone not showing up in the character appearance menu 2018-11-20 09:15:32 -05:00
deathride58
9158d323a5 buffs lavaland's cacti just a smidge by increasing the amount of vitfro they have by 1.5x (4 > 6) 2018-11-20 06:19:27 -05:00
kevinz000
0872780f81 Update tomato.dm 2018-11-20 01:18:06 -08:00
nik707
251ff760ee Merge pull request #7741 from deathride58/defaultautofitviewport 
Makes auto fit viewport enabled by default for new players
 2018-11-20 00:05:43 -06:00
kevinz000
79b4d5f663 Update beam_rifle.dm 2018-11-19 20:24:21 -08:00