Commit Graph
2957 Commits
Author SHA1 Message Date
siliconsandGitHub efc4e089c9 Merge pull request #13503 from Hatterhat/glaive-knuckledagger
survival daggers, luxpod capsule resprite, glaive sprite tweaks soon (tm)
2020-10-06 17:03:44 -07:00
siliconsandGitHub f6bbfc2c88 Merge pull request #13513 from timothyteakettle/eye-sprites
adds selectable eye types to customization
2020-10-06 16:51:44 -07:00
siliconsandGitHub 8eac1cb939 Merge pull request #13511 from Hatterhat/hakitavolver
additional revolver sprites
2020-10-06 16:51:18 -07:00
Hatterhat c063004d60 blued, but dark 2020-10-06 14:50:58 -05:00
Hatterhat 5a517be5e7 thanks toriate 2020-10-06 12:47:00 -05:00
Hatterhat dbdec5bbae man i am really indecisive 2020-10-06 11:39:19 -05:00
Hatterhat 2e7101fdc5 funny revolver sprites - squashed 2020-10-05 22:56:52 -05:00
siliconsandGitHub 915d2c726b Merge pull request #13518 from TheObserver-sys/spritefixmaybe
Plant Sprite Fixes II: The Mycus must grow! (And the grass should die)
2020-10-05 10:21:37 -07:00
Timothy Teakettle 05aef528d7 finishing touches 2020-10-04 17:33:46 +01:00
The0bserver e78fdee430 Yes, I did just CnP chanterlle-grow3 for harvest. Sue me, im lazy 2020-10-04 01:43:33 -04:00
siliconsandGitHub 9faff5ecb6 Merge pull request #13461 from Detective-Google/arcade-carpets
adds arcade carpets
2020-10-03 18:07:44 -07:00
timothyteakettle dc70d17a1e customizable eyes 2020-10-04 01:19:29 +01:00
Timothy Teakettle 0c99b53c05 eyes 2020-10-03 23:22:53 +01:00
Hatterhat 4195f96876 glaive daggers squashed 2020-10-03 14:32:19 -05:00
siliconsandGitHub f6dccd5ac5 Merge pull request #12439 from timothyteakettle/cool-ipcs
makes ipcs more like robots (a partial port from skyrat)
2020-10-01 14:15:04 -07:00
Timothy TeakettleandGitHub 7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Detective Google 57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
Detective Google 7df8011c5a fixes the white tthing 2020-10-01 13:52:32 -05:00
Detective Google 98703e6ad6 Merge remote-tracking branch 'upstream/master' into arcade-carpets 2020-10-01 13:41:10 -05:00
CoreFlare 9d76f6af80 good cloaks
i like gooder cloaks
2020-10-01 15:08:39 +01:00
siliconsandGitHub d8e58b1c48 Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
siliconsandGitHub f8bd6d3f49 Merge pull request #13458 from lolman360/plumbingfix3
smoke machine/autoharvest hydro tray fix
2020-10-01 03:06:19 -07:00
siliconsandGitHub bbb7ff347d Merge pull request #13450 from MrJWhit/new-swat-sprites
Plz work, new heavy suits
2020-10-01 03:05:35 -07:00
siliconsandGitHub 47aef0d574 Merge pull request #13443 from ItzGabby/gabby-wooden-floors
Gabbys new wooden floor tile types
2020-10-01 03:04:21 -07:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Detective Google 643421bc23 adds arcade carpets
yay
2020-09-28 14:43:03 -05:00
lolman360 a2b7fd2279 sprite 2020-09-28 16:09:10 +10:00
Tupinambis 4897c23205 Icons and such 2020-09-27 15:19:43 -05:00
Tupinambis d2500fe389 Adds Methane and Methyl Bromide 2020-09-27 15:15:58 -05:00
EmeraldSundisk d47519c3fe and digi 2020-09-27 10:32:31 -07:00
MrJWhit b23e0a4db6 Update suits.dmi 2020-09-27 13:30:13 -04:00
EmeraldSundisk 48b8ea2b19 agony 2020-09-27 10:24:54 -07:00
MrJWhit 7951f1e314 new swat suits 2020-09-27 13:19:27 -04:00
siliconsandGitHub 511dfa84c0 Merge pull request #13427 from Trilbyspaceclone/booze
More animated drinks
2020-09-27 00:18:12 -07:00
siliconsandGitHub c17929e889 Merge pull request #13419 from Degirin2120/09/22/20_engi_hazard_jumpsuits
Adds engineering hazard jumpsuits
2020-09-27 00:11:30 -07:00
siliconsandGitHub 441d8de7aa Merge pull request #13415 from Tupinambis/moresprite
Sprite Improvements! Jetpacks, TEG, Antimatter.
2020-09-27 00:10:58 -07:00
siliconsandGitHub 9c53bd24c6 Merge pull request #13411 from Tupinambis/sprite
Eris Chair Port and Bed Sprite Improvements
2020-09-27 00:09:18 -07:00
siliconsandGitHub 1092eacc6e Merge pull request #13397 from ArchieBeepBoop/microfans
Micro Powered Fans!
2020-09-27 00:03:43 -07:00
ItzGabby b97b595f6f Three new wooden floor types 2020-09-26 18:29:46 -04:00
Mark9013100 e4f9849cc3 Adds engineering hazard jumpsuits 2020-09-25 15:40:38 -04:00
Timothy TeakettleandGitHub 106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
TrilbySpaceClone fc67ee610a reverts mojito changes 2020-09-23 18:09:01 -04:00
TrilbySpaceClone 4f0f752ac6 More animated drinks 2020-09-23 18:03:54 -04:00
Jay 3864f14843 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt 2020-09-21 22:19:45 -05:00
Tupinambis 4767978780 IDSwipe Revert 2020-09-21 14:56:22 -05:00
Tupinambis 6c580f0ad3 TEG fan revert. 2020-09-21 11:17:12 -05:00
Tupinambis 823257750b Lost coreshield_1-2 can't have shit in citadel. 2020-09-21 01:08:35 -05:00
Tupinambis 3d41d9d39a Engine Sprite Touchups, better card swiping thingy, better jetpack sprites. 2020-09-21 00:56:39 -05:00
siliconsandGitHub 26eebf3b32 Merge pull request #13408 from YakumoChen/dont-be-a-dick-shinji
Get in the damn robot, Skylar
2020-09-20 21:24:08 -07:00
Tupinambis 7adc226402 quickfix 2020-09-19 21:38:17 -05:00