shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,898 Commits 5 Branches 0 Tags
e292b050f8a413c3f643b20664f2ea3dcf6f4e21
Commit Graph

392 Commits

Author SHA1 Message Date
CitadelStationBot
02b3e47fc3 [MIRROR] Cosmic Bedsheet (#5170) 
* adds cosmic space bedsheet

* Cosmic Bedsheet
 2018-01-30 07:31:26 -06:00
CitadelStationBot
0b330482fc [MIRROR] New Coffin Sprite (#5190) 
* coffins have a new sprite (#34995)

* New Coffin Sprite
 2018-01-30 07:24:18 -06:00
CitadelStationBot
001dbde0c9 [MIRROR] Sexy Solar Sprites (#5191) 
* replaced solar panel sprites with better ones

* Sexy Solar Sprites
 2018-01-30 07:23:46 -06:00
LetterJay
b0c5941cd6 Merge pull request #5144 from Citadel-Station-13/upstream-merge-34957 
[MIRROR] Morgue and Crematorium Resprite
 2018-01-28 04:02:13 -06:00
Jittai
7dbcf48c5f Morgue and Crematorium Resprite (#34957) 
* REDO

* Touch ups to Crema-tray, removes displays (for now)

* Smaller Less Contrast Screens + Traffic Stop style Lights

* ok last 1 I swear
 2018-01-27 23:21:58 -06:00
uraniummeltdown
504a1d1ba9 new ore box sprite 2018-01-27 23:21:23 -06:00
oranges
8b2da0aa90 Merge pull request #34746 from DaxDupont/autolathe 
Makes the autolathe repeat it's animation while it's still printing.
 2018-01-24 14:14:37 -06:00
MrDoomBringer
8e090b430b Adds the Bluespace Drop Pod upgrade to the cargo express console 2018-01-23 01:36:43 -06:00
ShizCalev
fb86cf6878 Fixes syringe icons (#34704) 2018-01-22 12:01:02 -06:00
deathride58
3e26ab5ceb Merge pull request #4990 from Citadel-Station-13/upstream-merge-34678 
[MIRROR] Adds new eldritch longsword sprite
 2018-01-21 22:36:24 +00:00
Lexorion
5f3653f4a5 Adds new eldritch longsword sprite (#34678) 
* updates the eldritch longsword sprite

* properly rewinds the left inhand animation
 2018-01-21 04:17:51 -06:00
WJohn
bb3d4b13d4 gives greyscale sprite much more contrast (#34682) 2018-01-21 01:20:44 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
Jordan Brown
4047738e03 Merge pull request #34461 from AutomaticFrenzy/patch/heat-exchange-manifold 
Fix heat-exchange manifold icons facing the wrong way
 2018-01-16 07:40:38 -06:00
LetterJay
3c281161b8 Merge pull request #4853 from Citadel-Station-13/upstream-merge-34385 
[MIRROR] Greyscale wirecutters
 2018-01-16 03:53:36 -06:00
MoreRobustThanYou
053fe00021 Greyscale wirecutters (#34385) 
* Greyscale Wirecutters!

* WOOPS!

* Hopefully make the colors lighter.

* hexcodes

* Fixy fixy

* Add files via upload
 2018-01-15 15:16:47 -06:00
Ashe Higgs
9a5b1da92c Adds the Lightbulb bar sign (#34480) 2018-01-15 15:06:28 -06:00
Tad Hardesty
36265db1b2 Fix pixel offsets of east-facing unary atmospherics (#34293) 2018-01-11 21:27:53 -06:00
LetterJay
7c2662f1de custom item 2018-01-11 15:25:47 -06:00
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58
d1cec46035 aND FINALLY THE REST OF THE CODEBASE HOLY FUCK ITS DONE 2018-01-04 02:03:42 -05:00
ShizCalev
bf8e27e4f3 Fixes vent angles and inworld item icons 2018-01-02 20:10:38 -06:00
Dax Dupont
0ebd16f509 Solar control fixes (#33985) 
* Solar fixes

* Also removing the solcon-o icon
 2018-01-02 08:21:16 -06:00
oranges
3aef84aa5e Merge pull request #33778 from MrDoomBringer/youre-still,-in-a-dream,-SPACE-HEATEEER 
Updates space-heater sprite to 3/4, updates icon
 2017-12-30 16:53:48 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
Leo
70be709675 Merge pull request #33850 from nicbn/sprites 
Radiation sign no longer has blood on it
 2017-12-27 09:20:28 -06:00
arsserpentarium
a893559c6b [READY]Circuitry upgrades 2017-12-24 15:03:45 -06:00
CitadelStationBot
938f409782 [MIRROR] Christmas (#4491) 
* Christmas (#33690)

* Christmas Event Updates

* Dont recreate the list every time

* Check for drop del

* Changes some things to placate that one guy from FTL

* Christmas
 2017-12-22 13:14:25 -08:00
XDTM
6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209) 
* Adds abductor Mind Interface Devices, and a gland HUD

* .
 2017-12-18 20:29:37 -06:00
LetterJay
5636d9dad3 Merge pull request #4397 from Citadel-Station-13/upstream-merge-33433 
[MIRROR] Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter.
 2017-12-18 15:17:49 -06:00
KomradeSpectre
1cd746ba67 Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter. (#33433) 
* Added two new components, HSV to Hex RGB and RGB to Hex RGB, along with icons.

* Added valid input ranges to the extended_desc of the new converter components.
 2017-12-15 17:13:20 -06:00
Michiyamenotehifunana
e77c1a8a07 Consolidates NEB code into a modular package 2017-12-15 16:57:22 +08:00
nicbn
6f9ecf2f32 New closet sprites (#33207) 
They're new sprites deal with it
 2017-12-14 15:49:49 -06:00
JStheguy
9313fd65cf Adds Additional Electronic_Assembly Designs (#33466) 
* bloats electronic_setups.dmi

* new assembly naming scheme, redone legacy sprites
 2017-12-13 21:10:41 -06:00
deathride58
bf61f55b25 Fixes donator items not rendering properly when worn 2017-12-12 20:16:51 -05:00
uraniummeltdown
d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
deathride58
b8e55b6404 fixes compiling errors 2017-12-08 20:25:55 -05:00
deathride58
742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
 2017-12-08 19:58:41 -05:00
deathride58
15e245f9dc Merge pull request #4267 from Citadel-Station-13/upstream-merge-33344 
[MIRROR] Improves the Smoke Machine sprite
 2017-12-08 18:46:59 +00:00
deathride58
665cef7a35 Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231 
[MIRROR] Adds pet carriers
 2017-12-08 18:46:07 +00:00
MrDoomBringer
abf3531563 Improves the Smoke Machine sprite (#33344) 
* dab

* here you go WJ

Darkens sprite, adds detail (connector ports/shading)
 2017-12-08 10:34:57 -06:00
Ashe Higgs
315e1d718a Adds pet carriers 2017-12-08 10:34:05 -06:00
ACCount
eed4feb5a2 New IC manipulator sprites (#33360) 2017-12-08 10:33:09 -06:00
deathride58
a6aa181161 Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124 
[MIRROR] Moves some machine sprites into /machines/ folder
 2017-12-05 20:37:30 +00:00
deathride58
14ceab7ce2 Deletes cyrogenic2.dmi so the pr matches with upstream's 2017-12-05 15:16:04 -05:00
LetterJay
828df6f12a rreeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 2017-12-05 07:14:48 -06:00
ACCount
435e46e407 Moves some machine sprites into /machines/ folder 2017-12-05 03:24:03 -06:00
deathride58
0fc1837c3a standardizes wearable donor icon names, fixes recent donor items not rendering properly 2017-12-04 20:23:15 -05:00
deathride58
f57e02ce95 Merge branch 'master' into donoritemmodularization 2017-12-04 20:17:02 -05:00
deathride58
2f313bb92f reverts lighting.dmi sync, trying to figure out how to merge upstream with this branch with the new github desktop client 2017-12-04 20:04:02 -05:00