shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,311 Commits 5 Branches 0 Tags
d2d9cd7fc2a80bc7d4e4e8a7f4df2c5fdf5149e0
Commit Graph

682 Commits

Author SHA1 Message Date
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
deathride58
57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00:00
deathride58
216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935 
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
 2017-12-10 22:43:58 +00:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
uraniummeltdown
d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
oranges
30143ee601 Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE 
[READY]Fixes beam rifles and flightsuits
 2017-12-10 15:19:18 -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
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
Armhulen
45b9b4956c Fugu improvements (#33182) 
* come on, you know i wumbo you wumbo he she me wumbo

* it's hip to wumbo
 2017-12-06 06:32:50 -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
379f73d1e1 Merge branch 'master' into upstream-merge-32249 2017-12-04 23:15:38 +00: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
deathride58
64aadb868e Merge branch 'master' into upstream-merge-33213 2017-12-04 21:39:30 +00:00
AnturK
1cc3e33714 Holorecord disks. 2017-12-04 05:14:13 -06:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
Ashe Higgs
5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -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
4eceef7693 Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967 
[MIRROR] Added bot path data huds
 2017-11-30 04:34:25 +00:00
deathride58
6c6149e1af Merge pull request #4164 from Citadel-Station-13/upstream-merge-33127 
[MIRROR] Fixes twohanded weapons showing outdated icons when equipped to the back
 2017-11-29 03:29:17 +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
ShizCalev
47e0943c9c Fixes twohanded weapons showing outdated icons (#33127) 2017-11-28 19:04:09 -06:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06: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
ShizCalev
f22841d2fe Fixes space cat resting sprite 2017-11-22 10:47:30 -06:00