shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,371 Commits 5 Branches 0 Tags
c59bac3116a6cd0f4e647b99f4342a01539a9d4b
Commit Graph
991 Commits
Author SHA1 Message Date
deathride58andGitHub 21c07e6f97 Merge pull request #7441 from FlattestGuitar/blur 
Blurry eyes just got blurrier
 2018-08-12 20:38:50 -04:00
deathride58andGitHub 9dfc0eeb87 Merge pull request #7439 from Citadel-Station-13/sliding_puzzle_port 
Manual mirror of sliding puzzles from /tg/, as a lavaland ruin, and an admin smite
 2018-08-12 20:38:27 -04:00
Letter Nandkevinz000 6f84c924e1 ser.lazy == true (#7453) 2018-08-12 17:37:36 -07:00
Unknown 9ca7e38f7a Blurry eyes just got blurrier 2018-08-08 11:42:30 +02:00
kevinz000 4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
deathride58andGitHub d79712cbbf Merge pull request #7404 from Citadel-Station-13/hairstyles 
Near full port of all virgo hairstyles and facial hairs (hair_* + facial_* from human_face_m.dmi on virgo codebase)
 2018-08-04 00:21:56 -04:00
LetterJay a56220634a i have no idea 2018-08-03 19:47:21 -05:00
deathride58andGitHub 4eec300170 Merge pull request #7413 from Citadel-Station-13/zozzle 
Icon fix
 2018-07-28 09:20:24 -04:00
deathride58andGitHub f637425108 Merge pull request #7387 from Citadel-Station-13/wormhole_update 
wormhole guns now pass through mobs without doing anything but gain hitscan
 2018-07-28 09:17:00 -04:00
LetterJay 6722d9a20f yea 2018-07-27 09:03:03 -05:00
kevinz000 5b76760b29 Ports virgo hairstyles 2018-07-26 03:51:09 -07:00
LetterJay 42cb534ad0 sprite/desc change 2018-07-25 06:38:54 -05:00
LetterJay dbe376d751 bad names/var 2018-07-23 07:52:13 -05:00
LetterJay 82027db961 thing 2018-07-22 00:07:22 -05:00
Letter Nandkevinz000 dfb5837784 dhonk: not a conflict edition (#7389) 
* Add files via upload

* help, goon lawyers are here

they got me, MAINT NEAR SCIENCE
 2018-07-21 12:57:09 -07:00
kevinz000 6e03770b93 Wormhole Update 2018-07-21 01:07:21 -07:00
LetterJay bc02bd53cf copyright memes 2018-07-18 22:16:56 -05:00
deathride58andGitHub 6a5087877b Merge pull request #7129 from PolymorphBlue/vTecControl 
Modifies the vTec cyborg upgrade to be toggleable between off/half/full
 2018-07-09 00:26:23 -04:00
LetterJay a96b97a2b0 icon fix 2018-07-06 17:38:55 -05:00
LetterJay a64dba6270 Merge branch 'flagcape' 
# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/client/loadout/__donator.dm
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
 2018-07-06 00:51:42 -05:00
LetterJay 3d7d862861 fuckoff 2018-07-06 00:50:13 -05:00
LetterJayandGitHub 034a7da744 Merge pull request #7029 from Citadel-Station-13/kitsundevilwings 
Adds devilwings donor item for kitsun
 2018-07-06 00:40:00 -05:00
deathride58andGitHub 8173e11740 Merge pull request #7342 from Citadel-Station-13/upstream-merge-38909 
[MIRROR] Add medical HUD icon if the body has died recently enough to be defibbed
 2018-07-06 01:35:29 -04:00
deathride58andGitHub b97ed1d248 Merge pull request #7340 from Citadel-Station-13/upstream-merge-38908 
[MIRROR] Adds a sprite for Glowcaps.
 2018-07-06 01:34:50 -04:00
LetterJay f8828db041 donator cape 2018-07-05 23:43:47 -05:00
Jared-Fogleandletterjay 8a269e3398 Add medical HUD icon if the body has died recently enough to be defibbed (#38909) 
Health analyzers already will tell you this, so this just makes it easier. I
read this on the "Minor Suggestions" thread. I'm no spriter, so feel free to
tell me if my icon sucks. I had to add an "addtimer" to the death proc because
med_hud_set_status isn't called anymore after death.
 2018-07-05 18:55:54 -05:00
jegubandletterjay 0180039518 Adds a sprite for Glowcaps. (#38908) 2018-07-05 13:40:46 -05:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
LetterJayandGitHub b5b8ce5337 Merge pull request #7280 from Citadel-Station-13/upstream-merge-38751 
[MIRROR] Updates plastic flaps icon and cleans up its code
 2018-07-01 09:38:16 -05:00
LetterJayandGitHub be23ad6a06 Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656 
[MIRROR] Makes the deconstructable TEG working
 2018-07-01 09:36:57 -05:00
TerraGSandletterjay 2d3969882a Updates plastic flaps icon and cleans up its code (#38751) 
cl
imageadd: New icon for plastic flaps that actually looks airtight.
code: Update to plastic flaps code to use tool procs rather than attackby and removed two pointless states.
/cl

Gives plastic flaps an airtight look to fit their new property. Removes two defines that were just a functional copy of anchored. Replaces calls to attackby() with screwdriver_act() and wirecutter_act().
 2018-07-01 05:43:01 -05:00
Dennokandletterjay 58f634db63 deconstructable-TEG (#38656) 
Make TEG deconstructable.
 2018-07-01 05:41:53 -05:00
Thunder12345andletterjay 8c58a28a60 Adds a colour picker component for circuits (#38804) 
* added color picker IC component

* added sprite for color picker
 2018-07-01 05:40:43 -05:00
LetterJayandGitHub acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574 
[MIRROR] Global component signals
 2018-06-24 18:20:17 -05:00
Jordan Brownandletterjay c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
JStheguyandletterjay 02744c59a5 [READY] Helps data disks stop being unemployed (#38319) 
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
 2018-06-19 09:23:33 -05:00
LetterJayandGitHub 7ab66531bf Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539 
[MIRROR] Adds New Shuttle Chairs
 2018-06-18 21:58:42 -05:00
fludd12andletterjay 96b620d540 Adds New Shuttle Chairs (#38539) 
* I'm crashing this shuttle with no survivors.

* comma comma comma comma comma chameleon
 2018-06-18 09:38:25 -05:00
Tlaltecuhtliandletterjay 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
Poly 212d971c03 Modifies the vTec cyborg upgrade to be toggleable between off/half-boost/full-boost 
Adds a set of chevron icons to icons/mob/actions.dmi to show this - provided by Toriate
 2018-06-16 11:40:46 -07: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
deathride58andGitHub 5189199b50 Merge branch 'master' into kitsundevilwings 2018-06-12 07:57:15 +00:00
ShizCalevandletterjay 18bc48c0df Makes swimsuits underwear (#38372) 2018-06-11 00:14:45 -05:00
Kraseoandletterjay cf8436cf6d a slippery slope into h*ck (#38303) 2018-06-07 20:00:36 -05:00
deathride58 303d939116 Adds devilwings donor item for kitsun 2018-06-07 00:27:23 -04:00
CitadelStationBotandkevinz000 0b362e017b [MIRROR] Lavaland Clock Cult Ruin (#7011) 
* Lavaland Clock Cult Ruin (#38263)

* Dead Ratvar

* tgm map

* Lavaland Clock Cult Ruin
 2018-06-05 11:16:55 -07:00
LetterJayandGitHub 72dd7cc3a5 Merge pull request #7008 from Citadel-Station-13/upstream-merge-38262 
[MIRROR] New directional beach sprites and corners for the 2018 Summer Ball
 2018-06-04 07:55:36 -05:00
CitrusGenderandletterjay bd6fb5f9e5 New directional beach sprites and corners for the 2018 Summer Ball (#38262) 
* Adds beach corners, interior corners, and other sides in addition to the normal down direction.

* SOMEONE LIED TO ME

* Update misc_plating.dm

* don't copy paste at 4am

* okay there we go
 2018-06-04 00:47:45 -05:00
MrDoomBringerandletterjay 678e429dbf Adds a Supplypod-delivery admin smite (#38069) 
* wa la

* oop forgot an icon

* buildmode compatibility

* ok

* makes centcompod default

* CentCom pods fall faster and are capatilized right

* yike

* yike2

* FASTER

* white space and default icon state

* spacemaniac thanks
 2018-06-04 00:37:24 -05:00