shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,498 Commits 5 Branches 0 Tags
cbf02e76a44ef04652df87ab0c4e68e720183e21
Commit Graph

130 Commits

Author SHA1 Message Date
kevinz000
adeb33cdae Merge pull request #9463 from Owai-Seek/minor-fixes 
Updating Kinkmate item-list
 2019-10-13 13:54:26 -07:00
Winter Flare
2bce423ec3 Added a -ton- of stuff to the Kinkmate 2019-10-10 14:08:14 -04:00
Ghommie
c4a8b80851 No digitigrade plasmaman suits spriting, thank you. 2019-10-08 18:43:40 +02:00
Ghommie
99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 2019-10-07 21:41:04 +02:00
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up 
Adds a new traitor bundle - Synda Major Leage Player
 2019-09-21 01:56:41 -07:00
TrilbySpaceClone
fa868ce4ff fashen crime 2019-09-11 14:22:50 -04:00
Trilbyspaceclone
a751a73113 Apply suggestions from code review 
thx Ceb

Co-Authored-By: cebutris <cebutris2000@gmail.com>
 2019-09-10 18:52:49 -04:00
TrilbySpaceClone
0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
lolman360
c618ce114d Ebb 2019-08-22 14:18:49 +10:00
kevinz000
47dd8d22eb Merge pull request #9149 from Trilbyspaceclone/padding_and_such 
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
 2019-08-18 23:37:56 -07:00
TrilbySpaceClone
e69d27f9eb Traitor armor 2019-08-17 20:36:47 -04:00
lolman360
0451390778 control click and then drag is easy 2019-08-11 11:16:19 +10:00
Ghommie
b1b4d63619 Removes flashproofness, moves slowndown to under. 2019-08-05 06:07:45 +02:00
Ghommie
5ee9b4d4f4 part 1 plasmaman stuff. 2019-08-01 06:58:21 +02:00
Sishen
68083aa0c6 a 2019-07-25 21:43:02 -04:00
Sishen
a4529491ea Update color.dm 2019-07-25 21:43:02 -04:00
Sishen
1a92134ad3 b 2019-07-25 21:43:02 -04:00
Sishen
612021b9d5 h 2019-07-25 21:43:02 -04:00
kevinz000
2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
31bd9104bb Ports "Adds blueshirt items to sectech and defines them better." 2019-07-13 06:42:09 +02:00
TrilbySpaceClone
74c607b2df Ghommie Asked 2019-06-23 17:15:03 -04:00
Trilbyspaceclone
8418ce8a34 Merge branch 'Poojawa_How_Do_I_Update_My_Shit' into Just-in-case-pls 2019-06-23 02:54:02 -04:00
TrilbySpaseClone
0ea7ce3731 No... 2019-06-23 02:51:01 -04:00
Trilbyspaceclone
4278284e7b Merge branch 'master' into Poojawa_How_Do_I_Update_My_Shit 2019-06-23 01:52:59 -04:00
TrilbySpaseClone
7f4d60ae25 Poojawa this would been easyer with webedits 2019-06-23 01:49:45 -04:00
SkullyRoberts
30b8d8db1a Made the nudity permit cover genitals and boobs 2019-06-08 18:38:28 -04:00
SkullyRoberts
5a9269db73 removed duplicate hides_bulges 2019-06-07 12:56:25 -04:00
SkullyRoberts
1a5c487e22 Ported the nudity permit from RP and made it a loadout option 2019-06-07 12:37:37 -04:00
Trilbyspaceclone
81250ae377 Merge branch 'master' into morefamstuff 2019-02-14 20:38:54 -05:00
Trilbyspaceclone
3aee62eeb7 Update accessories.dm 2019-02-14 20:22:13 -05:00
Ragolution
6aed6d5612 Fixes all vg/5th port uniforms that aren't commented out for whatever reason. 
I'm pissy that this was so easy and nobody else bothered to do it.
 2019-01-04 01:55:33 -05:00
Redtail
4c7075f1a8 New medals added. 
add:  Two new medals for engineering and medical to give out.
 2018-12-08 12:12:36 -06:00
Poojawa
42b1d03d2a [READY] Tauric full body suits (#7639) 
* let's get this back on the table

* split 'em up because sorting memes

* Gets stuff code-ready, sprite work to continue

Engineering / Atmosia / Cheng
Civilian Space
Blood Red / Red and Black
Riot / Armor vests
Radiation / Fire / Atmosia Fire
Bio Suits (Viro/CMO/basic)
ERT / Deathsquad

* It's messy, but it works so w/e

* let there be more tail access

* finishes naga taur spriting

* memes

* super fixes any lingering memes

* leg experiment

* nah, this isn't gunna work.

* poked at canine again

* saving memes

* tweaks some fixes and things

* finished quad suits, added bomb suits for nagas also

* "inconsistant indentation" Byond you fuck

* Take that, byond

* The war on Byond continues

* let's make sure the explorer gear uses fancy sprites

* syndiE ??? wtf did I sleep type
 2018-10-18 09:30:37 -07:00
Poojawa
636f3e7d21 black_tang_l 2018-10-04 21:57:06 -05:00
Poojawa
7825905a82 Probably fixes some dress oddities 2018-10-03 15:16:27 -05:00
Poojawa
729790f9d3 Overhauls some code, double checks uniforms 2018-09-28 03:54:57 -05:00
Poojawa
70d969c5cf Enables Digitigrade jumpsuit wearing 2018-09-27 05:08:39 -05:00
Poojawa
4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
AnturK
18dd26ee3a Adds missing armor to accessories (#38800) 2018-07-01 05:41:32 -05:00
ShizCalev
18bc48c0df Makes swimsuits underwear (#38372) 2018-06-11 00:14:45 -05:00
Kraseo
cf8436cf6d a slippery slope into h*ck (#38303) 2018-06-07 20:00:36 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
vuonojenmustaturska
998e49da06 Merge pull request #37809 from Qbopper/secskirts 
Adds security jumpskirts this time with less broken github
 2018-05-13 12:11:02 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00