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

195 Commits

Author SHA1 Message Date
kevinz000 b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad 
Addtion ways to deal with radiation
 2019-04-06 19:14:46 -07:00
Poojawa d8312ec5ae Medical belt overlays + hypo storage 2019-04-04 18:38:34 -05:00
Trilbyspaceclone 9ab2bf3860 + <-- BAD 2019-04-04 16:28:18 -04:00
Trilbyspaceclone 003dd6d93d + is bad I guess 2019-04-04 15:53:36 -04:00
Trilbyspaceclone f92ba3714d Grammar fix 2019-04-04 13:58:21 -04:00
Trilbyspaceclone 76c952cd6f Update firstaid.dm 2019-04-04 13:57:15 -04:00
deathride58 aa38960ab6 Update code/game/objects/items/storage/bags.dm 
Co-Authored-By: Seris02 <49109742+Seris02@users.noreply.github.com>
 2019-04-01 11:01:26 +08:00
Seris02 c91fd98fb0 adds bluespace bio bags 2019-03-31 15:13:01 +08:00
Trilbyspaceclone 81250ae377 Merge branch 'master' into morefamstuff 2019-02-14 20:38:54 -05:00
Trilbyspaceclone 4223b4888b Yay 2019-02-14 19:38:56 -05:00
Trilbyspaceclone 7a2088aba6 Adds usefull tools/healing items to utility lockers - Requested by LeonDuvall (#7974) 
* Update utility_closets.dm

* Update firstaid.dm

* Update pill.dm

* Update hypospray.dm

* Update firstaid.dm

* Update pill.dm
 2019-02-13 20:46:55 -08:00
Trilbyspaceclone ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938) 
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-02-08 05:26:42 -08:00
Trilbyspaceclone 14b873c9aa [Ready] Fixes power tool drill fitting in boots/wallet (#7958) 
* Update wallets.dm

* Makes sure boots cant do it
 2019-01-27 00:34:36 -08:00
kevinz000 651741f6f9 Update toolbox.dm 2019-01-15 19:56:47 -08:00
deathride58 3fcedd08e9 Merge pull request #7798 from Citadel-Station-13/kevinz000-patch-18 
nerfs family heirloom to not work on things above or at 18 deflection and not work on items
 2018-12-20 03:24:47 -05:00
kevinz000 b079a5e8df Update toolbox.dm 2018-12-18 18:06:04 -08:00
kevinz000 900da0624b Update toolbox.dm 2018-12-11 01:53:27 -08:00
nik707 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
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
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 44d0c05100 Update toolbox.dm 2018-12-07 13:40:37 -08:00
Trilbyspaceclone 964f2f75d3 triv rethink 2018-12-06 18:39:01 -05:00
Trilbyspaceclone 5f3d9cfa7e syndicate bombs can now spawn in snack vests 2018-12-06 18:24:46 -05:00
Trilbyspaceclone 12e43ea5f3 Update wallets.dm 2018-11-21 02:44:59 -05:00
Trilbyspaceclone 5435fa4cba make triv rethink 2018-11-21 02:44:49 -05:00
Trilbyspaceclone e5a0b8d677 Wallets can hold valentine cards 2018-11-21 02:00:23 -05:00
Poojawa 7d300117af literally everything Bhjin has been complaining about 
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
 2018-09-18 03:59:46 -05:00
Poojawa afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58 70f979fa95 Merge pull request #7534 from nik707/stealthnerfs 
[s] nerfs smuggler satchels cus wtf
 2018-09-10 18:50:22 -04:00
deathride58 6fa011c1be INTRODUCING KITCHEN GUN (#7508) 2018-09-07 05:40:35 -07:00
nik707 2aa0eb2d1b different nerf 2018-09-04 16:31:35 -05:00
nik707 4b6398cfa9 nerfs smuggler satchels 2018-09-03 22:58:08 -05:00
deathride58 d57db6ba81 Merge pull request #7497 from improvedname/more-nerf 
Makes the syndicate suspicous toolbox not be called "suspicous anymore" but just black and red striped instead.
 2018-09-03 13:49:15 -04:00
Nick fad5d5db83 Update toolbox.dm 2018-08-29 17:49:00 +02:00
Nick 03358c2db6 Update toolbox.dm 2018-08-29 17:48:16 +02:00
Nick 770cefe387 Update toolbox.dm 2018-08-25 21:33:21 +02:00
kevinz000 b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
kevinz000 0ee8542677 Update toolbox.dm 2018-08-01 21:27:43 -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
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04: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
81Denton 241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533) 
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
 2018-06-18 09:37:48 -05:00
oranges 4f379bb0d0 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox 
[s] Fix lockboxes not actually being locked
 2018-06-11 22:30:08 -05:00
81Denton 2fb5bb10b5 Arcade reward: snack rigs (#38268) 
* chew you havisfaction a singlelicious satisfact to snack that up?

* random snack spawn and sponsor name

* static list/initialize
 2018-06-05 13:27:39 -05:00
LetterJay 37ff8a616d Merge pull request #7002 from Citadel-Station-13/upstream-merge-38225 
[MIRROR] Include item overlays in attack animations (shows the proper color of screwdrivers etc)
 2018-06-03 16:22:30 -05:00
vuonojenmustaturska 568dfa7f35 Include item overlays in attack animations (shows the proper color of screwdrivers etc) (#38225) 
* overlay attacks

* this works too

* fix trays too
 2018-06-03 13:25:19 -05:00
ShizCalev b7ae796734 Fixes cigar bugs (#38218) 2018-06-03 09:03:59 -05:00
JStheguy a3a0a49b5d Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo (#38161) 
* 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

* does sprite things to lighters and cigar cases

* darkened cigar case interiors

* tweaks lighter flames
 2018-06-01 09:53:33 -05:00