shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,424 Commits 5 Branches 0 Tags
516a2df48e4eb44d8c3a4fc21efa026ed611e5be
Commit Graph
261 Commits
Author SHA1 Message Date
deathride58andkevinz000 7db87db43a fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing (#7997) 2019-02-13 21:02:00 -08:00
Trilbyspacecloneandkevinz000 cf4c5bc7e5 Update snacks_other.dm (#7971) 2019-02-05 18:14:23 -08:00
Trilbyspacecloneandkevinz000 dab1591bca Update drinks_recipes.dm (#7962) 2019-01-27 00:35:43 -08:00
kevinz000andGitHub 71cf822138 Update snacks_bread.dm 2019-01-03 08:19:06 -08:00
kevinz000andGitHub a1836c98af Update snacks_bread.dm 2019-01-03 07:37:04 -08:00
kevinz000andGitHub bacb74ad47 Update snacks_bread.dm 2019-01-03 07:34:09 -08:00
kevinz000andGitHub e9ce54e397 Update snacks_bread.dm 2019-01-03 07:32:39 -08:00
Trilbyspacecloneandkevinz000 a47426ef48 Makes pinapple pizza eatable (#7821) 
>Not just removing it
 2018-12-18 21:25:40 -08: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
deathride58 621b0675e9 Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights 2018-11-16 21:12:07 -05:00
Trilbyspacecloneandkevinz000 67cc0d7ad3 [READY](?) Gives Warden/Hos/Det donuts healing powers with working code (#7662) 
* Gives Warden/Hos/Det donuts

* Better?
 2018-10-19 10:01:56 -07:00
Poojawa 91620218e4 some cherrypicked TG fixes and tweaks 2018-10-12 05:37:36 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58andkevinz000 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
kevinz000andGitHub 0e13b3b1c6 Update smartfridge.dm 2018-07-14 23:44:52 -07:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Time-Greenandletterjay 1a53b59b12 Fixes closed soda cans transferring (#38668) 2018-06-24 05:17:00 -05:00
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 46b2bc0c63 [MIRROR] [s]Add pacifism checks for screwdriver/bottle attacks (#7092) 
* Add pacifism check for screwdriver/bottle attacks (#38416)

* [s]Add pacifism checks for screwdriver/bottle attacks
 2018-06-15 02:42:34 -07:00
CitadelStationBotandkevinz000 ae9c3f4b83 [MIRROR] You can see what other people eat or drink (#7101) 
* You can see what other people eat or drink (#38395)

* Makes drinking message visible to others

* Makes swallow message visible to other people

* Adds visible messages for eating

* Update snacks.dm

* Update snacks.dm

* Update objs.dm

* Update drinkingglass.dm

* Update pen.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinks.dm

* Update condiment.dm

* Update snacks.dm

* Adds a few extra reagents to the borg shaker

* Update drinkingglass.dm

* Update drinkingglass.dm

* removes blood as a borg shaker reagent

* You can see what other people eat or drink
 2018-06-13 20:31:38 -07:00
deathride58andGitHub e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
Jordan Brownandletterjay 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
ShizCalevandletterjay 2e8cdac9a3 Eatting fried items actually consumes the item (#38054) 
* Eatting fried items actually consumes the item

* destroy
 2018-05-27 11:40:39 -05:00
LetterJayandGitHub 2a56a5d0c1 Merge pull request #6873 from Citadel-Station-13/upstream-merge-38048 
[MIRROR] [s] Fixes fried items losing inhands
 2018-05-27 01:31:42 -05:00
LetterJayandGitHub cfe5c7a962 Merge pull request #6895 from Citadel-Station-13/upstream-merge-38023 
[MIRROR] Fix various bugs with telekinesis
 2018-05-25 23:28:01 -05:00
Jordan Brownandletterjay e582e7019e Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay 
Fix various bugs with telekinesis
 2018-05-25 10:49:21 -05:00
yoriiandletterjay 01de74c83c Small QoL improvement on smartfridge item release (#37946) 
* item goes to hand

* this will compile

* Ugly hack give me a medal if this compiles.

* This one is real ugly now, speedmerge please
 2018-05-25 04:51:15 -05:00
ShizCalevandletterjay 569ec5dd1f Fixes fried items losing inhands (#38048) 2018-05-24 22:57:24 -05:00
LetterJayandGitHub 9ff3e78bbb Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598 
[MIRROR] Adds grenadine.
 2018-05-23 22:26:44 -05:00
LetterJayandGitHub db87f3dbae Merge branch 'master' into upstream-merge-37598 2018-05-23 07:44:52 -05:00
LetterJayandGitHub 5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJayandGitHub e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJayandGitHub 0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
LetterJayandGitHub 2b0a4f6737 Update drinks_recipes.dm 2018-05-17 23:44:36 -05:00
LetterJayandGitHub eb96fe9d02 Update bottle.dm 2018-05-17 23:44:27 -05:00
ThePainkillerandletterjay e2bcf82341 Adds Fernet, a digestif that reduces your satiety. 2018-05-17 10:19:40 -05:00
LetterJayandGitHub f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
 2018-05-14 12:28:41 -05:00
JStheguyandletterjay c462c16cc7 Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites. (#37794) 
* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there

* updated vending machine, burger, and donut sprites

they've all been improved marginally

* edits roborger a bit more

"bun" is flatter, has an antenna that blinks in agony
 2018-05-13 19:47:01 -05:00
LetterJayandGitHub 3ce9fba8bf Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589 
[MIRROR] Adds 5 new drinks
 2018-05-13 11:52:12 -05:00
LetterJayandGitHub 34bf8d11aa Update drinks_recipes.dm 2018-05-13 10:15:47 -05:00
LetterJayandGitHub a3fb8d5ed4 Update drinks_recipes.dm 2018-05-13 10:15:12 -05:00
Tad Hardestyandletterjay 021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
deathride58andGitHub 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
PoeticIronandCitadelStationBot 66f05776e6 Fixes Tequila Sunrise naming (#37657) 
Changes 'tequila Sunrise' to 'Tequila Sunrise' as per Issue #37652
(https://github.com/tgstation/tgstation/issues/37652)
 2018-05-04 06:50:43 -05:00
ShizCalevandCitadelStationBot b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
Hyacinth-ORandCitadelStationBot 4a7f656823 Adds grenadine. 2018-05-02 13:13:29 -05:00