shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,054 Commits 5 Branches 0 Tags
9c8959f2ff197f7c8b8f65a4870f8564e2bc79ab
Commit Graph

368 Commits

Author SHA1 Message Date
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
deathride58
8a75e55b42 Merge branch 'upstream-merge-33213' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33213 2017-12-04 16:54:32 -05:00
deathride58
9cdaac3640 updates tgui and adds the missing lighting.dmi 2017-12-04 16:53:49 -05:00
AnturK
1cc3e33714 Holorecord disks. 2017-12-04 05:14:13 -06:00
LetterJay
5ed186d5ee Merge pull request #4175 from Citadel-Station-13/upstream-merge-33171 
[MIRROR] New Construct Shell Sprite
 2017-12-03 06:10:13 -06:00
LetterJay
03b7839e41 donation fix 2017-12-03 06:07:20 -06:00
uraniummeltdown
19bd0b8486 new cult construct shell sprite (#33171) 2017-12-01 08:46:32 -06:00
LetterJay
4b25b45701 donation 2017-11-30 07:49:42 -06:00
deathride58
b9f42c299b Merge pull request #4152 from Citadel-Station-13/upstream-merge-33134 
[MIRROR] Removes "machine prototypes"
 2017-11-30 04:46:25 +00:00
deathride58
0560a94824 Merge pull request #4154 from Citadel-Station-13/upstream-merge-33122 
[MIRROR] Moves pipe meter sprites
 2017-11-29 03:21:45 +00:00
ACCount
d883ec3114 Moves pipe meter sprites (#33122) 2017-11-28 06:28:31 -06:00
ACCount
b15481c7cd Removes some unused sprite files (#33121) 
* Removes two unused sprite files

* Removes two more sprites
 2017-11-28 06:28:23 -06:00
ACCount
0ad637388f Removes "machine prototypes" 2017-11-28 06:28:15 -06:00
ACCount
0be326633d More integrated circuit fixes and code improvements 2017-11-26 04:56:44 -06:00
Emmett Gaines
8c11252d93 butterdogs (#33002) 2017-11-25 15:35:21 -06:00
ACCount
2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58
60b2c25668 donator item modularization + manual sync of sprites upstream 2017-11-22 17:16:37 -05:00
deathride58
2abd06e25e Merge pull request #4028 from Citadel-Station-13/upstream-merge-32862 
[MIRROR] Rat Kebabs
 2017-11-21 04:39:41 +00:00
deathride58
a72625b486 adds missing icon file 2017-11-20 22:56:28 -05:00
deathride58
c0a6ada6d2 Merge pull request #4038 from Citadel-Station-13/upstream-merge-32894 
[MIRROR] Fixes default green banded airlocks missing expanded click area in their sprite.
 2017-11-21 03:35:48 +00:00
LetterJay
94046f89da donator sprites 2017-11-20 14:22:29 -06:00
WJohn
a5c5ec4ec7 Fixes default green banded airlocks missing expanded click area in their sprite. (#32894) 2017-11-20 04:36:15 -06:00
ShizCalev
8784aa9a45 Updates modular computer Nanotrasen logo (#32822) 2017-11-18 13:50:45 -06:00
deathride58
7c7c050cdb adds the sprites that didnt get mirrored in #3993 2017-11-17 23:10:15 -05:00
ike709
1babecaf3c New vent and scrubber sprites (#32742) 
* New vent and scrubber sprites

* Readds OFF and siphon arrow to map sprites
 2017-11-15 19:09:21 -06:00