shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,316 Commits 5 Branches 0 Tags
3a2a9997bd4c02e313ffca2c9902b0eaefce4b4c
Commit Graph
1326 Commits
Author SHA1 Message Date
Jay e1c8d669d5 Exo frame donator 2020-11-07 10:23:14 -06:00
Timothy TeakettleGitHubGhom
 		46dbb9345d slime puddles look better and cant be abused by lings (#13567) 
* perfect

* further changes

* no squeaking please

* no more squeaking damnit

* no more squeaking damnit

* slower

* they get broken armor

* broken armor application

* Apply suggestions from code review

* add a comma

* make crossed work properly

* Update squeak.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-11-01 21:40:58 +01:00
siliconsandGitHub 5c53a2cbe2 Merge pull request #13607 from timothyteakettle/polychrome-maid 
polychromic maid outfit
 2020-10-28 07:46:55 -07:00
Heretical LizardGitHubDan-Neposh
 		576c74dc5f Resprites the brass claw to make it more like a cwc weapon (#13586) 
No more cheetos blade. Also sorts its file to be next to the spear, purely because that annoyed me that it wasn't next to the other weapon,

Co-authored-by: Dan-Neposh <keatesequoy@gmail.com>
 2020-10-25 14:10:48 +01:00
siliconsandGitHub 231c5f0a9d Merge pull request #13581 from Ghommie/Ghommie-cit840 
mime/clown masks' face concealment toggleable with altclick. Plasmaman helmet welding visor & smiley port.
 2020-10-21 15:43:09 -07:00
Timothy Teakettle 0db87ea5f8 better sprite 2020-10-21 22:04:07 +01:00
timothyteakettle 049f153cbf works but looks weird 2020-10-21 00:55:02 +01:00
Jay 44fa0d5387 donator vest and shirt 2020-10-19 12:30:35 -05:00
ZandarioandGitHub fcd8fec815 Fixes an oversight and updates some defines (#13558) 2020-10-17 12:37:58 +02:00
Ghommie c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
siliconsandGitHub ff46bfda10 Merge pull request #13547 from zeroisthebiggay/crepe 
security fashion power crêpe but it's a sheath for your anime sword
 2020-10-11 17:33:29 -07:00
siliconsandGitHub a5ace5ed3a Merge pull request #13543 from zeroisthebiggay/tyrna 
ports tg legion reworks, colossus now enrages against sand golems, and some minor sprite stuff with him too
 2020-10-11 17:33:16 -07:00
TupinambisandGitHub 3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
Putnam3145andGitHub cbb6020d49 Merge pull request #13553 from timothyteakettle/eye-sprites 
fixes eye sprites up
 2020-10-11 11:56:08 -07:00
Timothy Teakettle 89f2c53d88 ignore those reverts 2020-10-11 18:23:56 +01:00
Timothy Teakettle 5e616f6297 Revert "Revert "finishing touches"" 
This reverts commit b650fa1761.
 2020-10-11 17:11:27 +01:00
Timothy Teakettle 5aff38597f Revert "Revert "Revert "Revert "customizable eyes"""" 
This reverts commit d852aacb78.
 2020-10-11 17:11:01 +01:00
Timothy Teakettle d852aacb78 Revert "Revert "Revert "customizable eyes""" 
This reverts commit dedfdf224d.
 2020-10-11 16:55:07 +01:00
Timothy Teakettle dedfdf224d Revert "Revert "customizable eyes"" 
This reverts commit 9f3d745d80.
 2020-10-11 16:54:53 +01:00
Timothy Teakettle b76b97fbe9 Revert "Revert "eyes"" 
This reverts commit 4526fef297.
 2020-10-11 16:54:50 +01:00
Timothy Teakettle 4526fef297 Revert "eyes" 
This reverts commit 0c99b53c05.
 2020-10-11 16:54:12 +01:00
Timothy Teakettle 9f3d745d80 Revert "customizable eyes" 
This reverts commit dc70d17a1e.
 2020-10-11 16:54:09 +01:00
Timothy Teakettle b650fa1761 Revert "finishing touches" 
This reverts commit 05aef528d7.
 2020-10-11 16:54:01 +01:00
zerothebigboy c77a1ada93 cringe 2020-10-11 03:18:29 -04:00
zerothebigboy a8315a69e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe 
# Conflicts:
#	icons/mob/clothing/belt.dmi
#	icons/obj/clothing/belts.dmi
 2020-10-11 01:19:18 -04:00
siliconsandGitHub d2ce6ca709 Merge pull request #13540 from TheObserver-sys/QoLPass 
Service+Plumbing QoL Pass 1:  Beakers, Belts, Plungers and Pipes
 2020-10-10 22:04:49 -07:00
siliconsandGitHub c3983ee55b Merge pull request #13535 from Hatterhat/energy-sabres 
[READY] Energy Sabers - an elegant esword skin for a more civilized age
 2020-10-10 22:04:17 -07:00
siliconsandGitHub 8b48cab574 Merge pull request #13233 from Hatterhat/za-hando 
[READY] za hando - a pr about ling claws and punching shit
 2020-10-10 21:59:05 -07:00
zerothebigboy 9d281a70ae oops 2020-10-10 21:45:44 -04:00
zerothebigboy ef073167df crepe 2020-10-10 21:39:45 -04:00
zerothebigboy 285b26d35e sex 2020-10-10 15:08:22 -04:00
siliconsandGitHub ad32b8f437 Merge pull request #13472 from timothyteakettle/slime-puddle 
the pr that lets slimes turn into useless puddles
 2020-10-10 11:14:25 -07:00
siliconsGitHubLetter NPutnam3145
 		19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
The0bserver 98f398338a belt fix and icons 2020-10-09 02:34:42 -04:00
Hatterhat 8d0f5c8380 saber inhands WOO 2020-10-08 19:38:10 -05:00
Hatterhat 96e55d6233 the last bit 2020-10-07 17:50:21 -05:00
Timothy TeakettleandGitHub e2c6a19da7 Merge branch 'master' into slime-puddle 2020-10-07 23:37:30 +01:00
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
Timothy Teakettle 05aef528d7 finishing touches 2020-10-04 17:33:46 +01: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
timothyteakettle 950cb05617 Merge remote-tracking branch 'upstream/master' into slime-puddle 2020-10-02 15:53:48 +01:00
Tupinambis d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis f1bc1ccafb Merge branch 'master' into spooder 
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
 2020-10-01 17:10:42 -05:00
Detective Google 57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -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 bbb7ff347d Merge pull request #13450 from MrJWhit/new-swat-sprites 
Plz work, new heavy suits
 2020-10-01 03:05:35 -07:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00