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

570 Commits

Author SHA1 Message Date
deathride58
b9d5beeefd Merge pull request #7932 from Trilbyspaceclone/racec 
[Ready] Adds the abilty to make 3 lesser race tonics
 2019-01-21 19:47:48 -05:00
kevinz000
93acbf0a1d Update other_reagents.dm 2019-01-15 19:51:08 -08:00
deathride58
5ebc570c7a Merge pull request #7888 from Citadel-Station-13/kevinz000-patch-5 
Reworks ephedrine
 2019-01-14 21:37:45 -05:00
Trilbyspaceclone
910c79efdf sure thing 2019-01-13 13:27:14 -05:00
Trilbyspaceclone
d4b6da5d6e Update others.dm 2019-01-13 12:16:25 -05:00
kevinz000
246d6b391f Update medicine_reagents.dm 2019-01-04 00:47:02 -08:00
kevinz000
5abdf53e35 Update medicine_reagents.dm 2019-01-03 16:31:24 -08:00
kevinz000
dc5f4ea67b Update medicine_reagents.dm 2019-01-03 16:15:34 -08:00
kevinz000
2444fac7b5 Update medicine_reagents.dm 2019-01-03 16:14:24 -08:00
kevinz000
b365db114f Update food_reagents.dm 2019-01-03 08:32:12 -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
deathride58
313ec9cb6f removes rant comment to appease the hungersune 2018-11-19 10:13:09 -05:00
deathride58
9f7098231b y'all n'wahs don't even smoke weed - adds skooma (and adds the ability for reagents to define custom addiction stages) 2018-11-19 06:48:11 -05:00
Poojawa
35ae45e220 make it actually check for THICKMATERIAL 2018-10-13 06:54:20 -05:00
Poojawa
6268e2f143 stops patches from applying magically through suits 2018-10-13 04:45:48 -05:00
Poojawa
3009e8085f Reduces Station aquirable stamina heals (#7593) 2018-09-26 12:38:49 -07:00
deathride58
7b4c5658e5 Merge pull request #7566 from Poojawa/action-buff 
Buffs Action, Promotes fun
 2018-09-26 15:24:58 -04:00
Ignari-Coldstorm
967a535aeb New Reagent, Universalizes Survival Medipen (#7570) 
* New Reagent, Universalizes Survival Medipen

Adds an alternate regenerative jelly for the survival medipens used in mining. Replaces the tricord and omnizine in medipens with 15u of Neo Jelly. Makes medipens finally useful for slime miners. When ODed on Neo Jelly, causes heavy brute/burn and minor oxyloss and causes no toxin damage.

* code alter

adds * to the REM.

* additional code fix

removes the M.adjustToxLoss line, and corrects code text to 52 units injected, from 57.
 2018-09-26 12:07:00 -07:00
Poojawa
5b17fbdbdb buffs changling adrenal OD damage 
also attempts a revive of travis without PR spam
 2018-09-26 01:22:04 -05:00
Poojawa
12a9989a7c runtime fixes 2018-09-22 04:06:06 -05:00
Poojawa
d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa
99e57fb221 various citadel tweaks/fixes 
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
 2018-09-17 03:26:05 -05:00
Poojawa
9b4b5f87c4 Buffs Action, Promotes fun 2018-09-11 23:42:13 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites 
Nanites port
 2018-09-03 13:47:28 -04:00
LetterJay
1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
Tupinambis
02a86dd2a0 New Alien Lavaland Ruin (#7455) 
* Removes the old "xeno nest" lavaland ruin that currently is blacklisted on the live server, and replaces it with a new "alien nest" ruin.

* Tiny ruin description change.

* Removed all organs scattered around the nest, and replaced them with corpses you must harvest the organs from. Also slightly changes the loot and the locations of said loot.

Drone and Queen corpse spawners have been added.

* Removed xenomorph queen corpse, moved drone corpse into a location that is harder to cheese. Added "Hive's Blessing" (Syringe containing alien microbes.)
 2018-08-23 00:26:32 -07:00
Hatterhat
72231976a7 Replaces plasma in execution syringes with amatoxin (#7360) 
* Removes plasma from execution syringes

holy shit what a meme

* Replaces initropidril with amatoxin

shit man idk lmao
 2018-08-03 19:30:10 -07:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362) 
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
 2018-07-20 03:40:39 -07:00
81Denton
023f53a470 Improves cargo shuttle/firefighting foam descs (#38927) 
* Improves cargo shuttle/firefighting foam descs

* oof
 2018-07-06 09:42:33 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
389faab2a5 Merge pull request #7267 from Citadel-Station-13/upstream-merge-38728 
[MIRROR] Gives honey antibiotic properties
 2018-07-01 09:33:36 -05:00
LetterJay
7100ae3a7b Merge pull request #7259 from Citadel-Station-13/upstream-merge-38727 
[MIRROR] Prevents reagents being transferred to a bucket while its worn on a head
 2018-07-01 09:30:46 -05:00
81Denton
f244ec31a0 Gives honey antibiotic properties (#38728) 
* Gives honey antibiotic properties
henk

* 0.6
 2018-06-26 20:30:41 -05:00
Irafas
feb01437d6 Prevents reagents being transferred to a bucket while its worn on a head (#38727) 
* Fixed bucket hat bug

Stopped the user from pouring reagents into a bucket while worn as a hat. Does so by changing the bucket to not have a container type until its removed

* Should work

* Works better

* ExcessiveUseOfCobblestone is right, this better

* As per recommendation
 2018-06-26 15:33:30 -05:00
Jordan Brown
4baee89615 Merge pull request #38699 from Irafas/HardsuitEyeFix 
Hardsuit helmets protect eyes from pepperspray
 2018-06-25 09:19:58 -05:00
Tlaltecuhtli
01eb1bc7fe [READY] better contraband crates (#38321) 
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
 2018-06-21 18:52:15 -05:00
CitadelStationBot
db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
LetterJay
fb53413ded Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270 
[MIRROR] [READY] advanced foam extinguisers [READY]
 2018-06-18 12:28:42 -05:00
LetterJay
c58dbc1110 Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476 
[MIRROR] [s] Fix launchpads creating way too many sparks
 2018-06-18 10:09:42 -05:00
LetterJay
8393a6b34b Merge pull request #7133 from Citadel-Station-13/upstream-merge-38510 
[MIRROR] Cleans up the chem synths jesus christ what the fuck
 2018-06-18 09:52:24 -05:00
Tlaltecuhtli
1a42719d80 Advanced foam extinguisers (#38270) 
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
 2018-06-18 09:38:07 -05:00
LetterJay
5ee2ee38b3 Revert "[MIRROR] Fixes chem heater trying to heat up empty beakers." 2018-06-16 16:18:50 -05:00
LetterJay
cc54931a66 Merge pull request #7096 from Citadel-Station-13/upstream-merge-38434 
[MIRROR] Fixes chem heater trying to heat up empty beakers.
 2018-06-16 16:18:42 -05:00
Jordan Brown
e95851c8f6 Merge pull request #38476 from AutomaticFrenzy/patch/sparks 
[s] Fix launchpads creating way too many sparks
 2018-06-16 15:53:42 -05:00
Dax Dupont
899d1e2d73 Cleans up the chem synths jesus christ what the fuck 2018-06-16 15:38:22 -05:00
Armhulen
bf4be90f76 quickie fixies (#38511) 2018-06-16 06:16:56 -05:00
CitadelStationBot
eafb25535a [MIRROR] Adds a new drink: Peppermint Patty from Archer! (#7094) 
* Adds a new drink: Peppermint Patty from Archer! (#38427)

* Sprites!

*  S_______ W________

* Candyland snuck into pr... Check!

* removal of candyland extract

* candyland but not the sprites yet.

* fixes :)

* Whoops, lets fix that too

* Adds a new drink: Peppermint Patty from Archer!
 2018-06-15 02:46:40 -07:00