shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,115 Commits 5 Branches 0 Tags
3fcedd08e961645976e6d858f1dcf3ec443aae02
Commit Graph
7159 Commits
Author SHA1 Message Date
deathride58andGitHub fe92f9106b Merge pull request #7833 from Citadel-Station-13/exemption 
JEXP Exemption now exempts from account age locks too
 2018-12-20 03:15:11 -05:00
Trilbyspacecloneandkevinz000 a47426ef48 Makes pinapple pizza eatable (#7821) 
>Not just removing it
 2018-12-18 21:25:40 -08:00
Ignari-ColdstormandGitHub aa57d42d6c Fixes duplicate medipen. 
Fixes a duplicate medipen showing up in vendor list.
 2018-12-17 20:28:04 -06:00
kevinz000 8812ef9ddd exemption 2018-12-16 11:05:26 -08:00
Ignari-Coldstormandkevinz000 9c16527cd4 Mining Vendor and PPKA changes! (#7817) 
* Mining Vendor and PPKA changes!

Adjusted the prices on a couple items as well as added in the pocket extinguisher to the vendor. Adjusted the Premium Proto-Kinetic Accelerator to have one less range.

* Update machine_vending.dm
 2018-12-16 03:56:21 -08:00
nik707andGitHub f9b257c2c6 Merge pull request #7809 from Citadel-Station-13/kevinz000-patch-17-1 
While we're at it let's remove beepsky hating on furries too
 2018-12-15 15:20:35 -06:00
nik707andGitHub 5eaeb6b928 Merge pull request #7824 from Citadel-Station-13/kevinz000-patch-23 
new players no longer see aooc
 2018-12-15 15:17:05 -06:00
nik707andGitHub a88434f69e Merge pull request #7823 from Ragolution/master 
Adjusts Egg Nog to be more immersive (and just in time for the Winter Ball)
 2018-12-15 15:16:26 -06:00
nik707andGitHub 2852daa27d Merge pull request #7815 from Trilbyspaceclone/Reece 
New admin buttens for Reece
 2018-12-14 21:05:13 -06:00
kevinz000andGitHub 941d5fcfba Update aooc.dm 2018-12-14 01:34:39 -08:00
Ragolution 2b97d32dd2 Improves Eggnog 
Changes icon state to new icon, rather than standard glass of yellow juice. Also adds flavorful description.
 2018-12-14 01:49:05 -05:00
Ragolution 517a6d71ef Revert "Update drinks.dm" 
This reverts commit f76d93a368.
 2018-12-14 01:45:39 -05:00
RagolutionandGitHub f76d93a368 Update drinks.dm 
* Changes flavor text to reflect status as not a carton.
 2018-12-14 01:26:34 -05:00
Trilbyspacecloneandkevinz000 3b24774714 Buffs NanoMed Wall units! (#7794) 
* removes some rouge things

* Kev wishes
 2018-12-13 11:51:55 -08:00
Trilbyspacecloneandkevinz000 c9c8207c6c Makes Bubble Gum a male - Requested by LeglessLizard (#7820) 
* Makes Bubble Gum a male

* var*

* >uses a unused var
 2018-12-13 11:49:39 -08:00
deathride58andkevinz000 fc3cca6a19 lets try to fix heat not spreading - makes hotspot_expose force turf air updates (#7814) 2018-12-13 11:48:57 -08:00
deathride58 11402e5337 this shit is much too hard for tg to handle - makes hotspot_expose ignite plasma and tritium a lot easier 2018-12-11 16:22:47 -05:00
kevinz000andGitHub 552a9622c7 Update human.dm 2018-12-11 01:09:03 -08:00
deathride58andGitHub abdf3b2cd9 Merge pull request #7800 from Citadel-Station-13/kevinz000-patch-19 
xeno tackles now hardstun for 3 seconds if someone is not lying down
 2018-12-10 19:26:58 -05:00
deathride58andGitHub 87f10ae5c5 Merge pull request #7801 from Citadel-Station-13/kevinz000-patch-20 
xenomorph neurotoxin now always hard stuns for 3 seconds, and do 25 stamina because honestly the stamina rework destroyed a major antagonist and it is sad
 2018-12-10 19:25:52 -05:00
nik707andGitHub f4c022d076 Merge pull request #7795 from Trilbyspaceclone/patch-21 
Syndicate bombs (The drink) can now spawn in snack vests
 2018-12-10 16:55:06 -06:00
nik707andGitHub 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
nik707andGitHub 1960947d25 Merge pull request #7803 from Trilbyspaceclone/patch-23 
Adds in white crayons to art crate.
 2018-12-10 16:44:25 -06:00
TrilbyspacecloneandGitHub 170a843288 recheck 2018-12-09 19:20:02 -05:00
TrilbyspacecloneandGitHub 63ad6f1175 Update vent_clog.dm 2018-12-09 15:15:23 -05:00
TrilbyspacecloneandGitHub 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
kevinz000andGitHub d049ecaecd Update hydroitemdefines.dm 2018-12-08 04:53:02 -08:00
kevinz000andGitHub a347cd14e2 eh 2018-12-08 04:19:41 -08:00
kevinz000andGitHub 7978daa370 oopsies woopsies i made a fucky wucky 2018-12-08 04:18:57 -08:00
kevinz000andGitHub a2f9135951 Update hydroitemdefines.dm 2018-12-08 04:16:04 -08:00
kevinz000andGitHub 6ba2d56435 Update neurotoxin.dm 2018-12-08 04:14:36 -08:00
kevinz000andGitHub f250d6ef94 Update human_defense.dm 2018-12-08 04:13:16 -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
TrilbyspacecloneandGitHub c9a4a08183 Merge pull request #4 from Trilbyspaceclone/lol 
Makes the glass
 2018-12-06 19:27:15 -05:00
TrilbyspacecloneandGitHub 4ad2b4d070 Makes the glass 2018-12-06 19:26:37 -05:00
Trilbyspacecloneandkevinz000 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
deathride58andGitHub 6ec059ecfa Merge pull request #7784 from nik707/buildmode 
Fixes buildmode, probably.
 2018-12-04 00:29:02 -05:00
deathride58andGitHub 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
nik707andGitHub 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
nik707andGitHub 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
nik707andGitHub 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
nik707andGitHub 4c0e2ee27b Merge pull request #7747 from Citadel-Station-13/kevinz000-patch-11 
[s] killer tomato logging
 2018-11-30 21:53:39 -06:00
nik707andGitHub 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
nik707andGitHub 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