shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,003 Commits 5 Branches 0 Tags
c8435a565854b0cdf163ab54ca8d52cd4f7a597a
Commit Graph

8113 Commits

Author SHA1 Message Date
kevinz000
c8435a5658 Merge pull request #8414 from Trilbyspaceclone/MASON 
New M.A.S.O.N rig
 2019-06-08 01:08:00 -07:00
kevinz000
3b24e05dd6 Merge pull request #8483 from Ghommie/Ghommie-cit23 
Ports in combat gloves plus.
 2019-06-08 01:07:18 -07:00
kevinz000
61d0ac9993 Merge pull request #8476 from Trilbyspaceclone/patch-157 
Tweaks/Buffs hierophant
 2019-06-08 01:05:28 -07:00
kevinz000
68ef76e09a Merge pull request #8432 from Ghommie/Ghommie-cit15 
Buffs stunprods to not have a cooldown
 2019-06-08 01:03:01 -07:00
kevinz000
c7f346a03c Merge pull request #8442 from Trilbyspaceclone/patch-139 
Makes soviet clothing no longer need to be hacked AND emaged
 2019-06-08 01:02:21 -07:00
kevinz000
8c632bed6f Merge pull request #8391 from Trilbyspaceclone/patch-132 
Gives pod lava land ruin a autolathen
 2019-06-08 01:00:41 -07:00
deathride58
1dde6b90ae Merge pull request #8538 from dtfe3/dtfe3-hair-twintail 
Hair - Long Twintails
 2019-06-08 01:37:29 -04:00
deathride58
7fcb46e0f6 Merge pull request #8468 from Citadel-Station-13/kevinz000-patch-41 
buffs disabler 20-->25 shots firerate 2.5/s --> 3.33/s speed 412.5-->471.5 pixels/s
 2019-06-08 01:09:52 -04:00
deathride58
8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf 
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
 2019-06-08 01:07:56 -04:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
kevinz000
31a942a63a Merge pull request #8534 from dtfe3/dtfe3-pink-panties 
Pink Panties
 2019-06-06 06:52:57 -07:00
kevinz000
7decce3808 Merge pull request #8525 from Trilbyspaceclone/patch-161 
Makes cookies loved by all
 2019-06-05 11:35:22 -07:00
kevinz000
0d97361dea Merge pull request #8430 from Trilbyspaceclone/bad_idea 
Adds improvised 7.62 rifle
 2019-06-05 11:31:10 -07:00
kevinz000
6e4a3c71f9 Merge pull request #8532 from Poojawa/WHYBYOND 
Without this, everyone is broken
 2019-06-05 11:30:09 -07:00
dtfe3
3de6e2d71a twintails... 
title
 2019-06-05 19:41:23 +02:00
dtfe3
d1d0f38460 Revert "test" 2019-06-05 19:29:53 +02:00
deathride58
98304e4975 Merge pull request #8424 from Arturlang/CTRL-Alt-Click-port 
Ctrl Alt Click on pipes, port from TG
 2019-06-05 12:54:36 -04:00
dtfe3
2e47c973c6 Pink Panties 2019-06-05 16:15:38 +02:00
Poojawa
27ef3ce281 Without this, everyone is broken 2019-06-05 08:10:20 -05:00
kevinz000
2c84d75ae6 Merge pull request #8528 from Poojawa/marking-mysteries 
Fixes prosthetic invisible hands, improves female markings
 2019-06-05 02:02:40 -07:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs 
Ports gang mode
 2019-06-05 01:55:19 -07:00
kevinz000
89bf36e6a9 Merge pull request #8491 from Ghommie/Ghommie-cit24 
zero, , null, and empty text strings, all fulfill the ! operator.
 2019-06-05 01:52:17 -07:00
kevinz000
3ab46405b8 Merge pull request #8489 from Coolgat3/tacticalwear 
Makes combat gloves look T A C T I C O O L
 2019-06-05 01:49:57 -07:00
kevinz000
98491cd2f8 Merge pull request #8504 from Trilbyspaceclone/patch-160 
buffs resonator
 2019-06-05 01:49:11 -07:00
kevinz000
cd38a29449 Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals 
Ports RP's deer taur and adds Elven ears to mammals
 2019-06-05 01:44:05 -07:00
kevinz000
adbbb2944a Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess 
Adds visible balls and multi-breasts
 2019-06-05 01:42:48 -07:00
kevinz000
102d68a243 Merge pull request #8518 from Ghommie/Ghommie-cit27 
Fixes and updates pod's emergency suits storage.
 2019-06-05 01:41:23 -07:00
kevinz000
52b189dc98 Merge pull request #8502 from Sishen1542/meatyors 
Meteor Sats not exclusive to station goal
 2019-06-05 01:40:50 -07:00
kevinz000
58bdac6965 Merge pull request #8524 from BurgerLUA/Ass-Blast-USA 
Adds a trait that makes you immune to ass slapping: BUNS OF STEEL.
 2019-06-05 01:40:28 -07:00
kevinz000
81ba2011d3 Merge pull request #8510 from Sishen1542/ghostmanbad 
Subtle 2: No Ghost Boogaloo
 2019-06-05 01:32:42 -07:00
Poojawa
a2b4f4261c Fixes missing hands and marking overlap 
cleans up the code a bit too. Improves female chest sprites.
 2019-06-05 02:33:25 -05:00
Poojawa
b053fe3c86 Probably fixes synth hand issues 2019-06-04 23:36:58 -05:00
Trilbyspaceclone
7fb1f7fba1 Update snacks_pastry.dm 2019-06-03 18:38:55 -04:00
BurgerLua
ed7d0575b2 Ass Blast USA 2019-06-03 14:40:57 -07:00
kevinz000
fc1611d86a Merge pull request #8426 from Sishen1542/sloom-hnngh 
Slimespeak!
 2019-06-03 00:51:36 -07:00
Ghommie
a0898a779a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit15 2019-06-02 22:48:38 +02:00
Ghommie
472d7ef8cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27 2019-06-02 19:03:34 +02:00
Ghommie
d6e54bf237 Fixes and updates pod's emergency suits storage. 2019-06-02 18:28:30 +02:00
Poojawa
d4abb85641 Update preferences.dm 2019-06-02 09:40:18 -05:00
Poojawa
69b1373209 compile testing and tweaks 2019-06-02 08:06:16 -05:00
Poojawa
818ec19561 Working as intended, fixed a few other missing sprites 
Started groundwork for multi-breasts and hidden balls.
 2019-06-02 04:44:57 -05:00
Poojawa
17ad519f24 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess 2019-06-02 03:00:46 -05:00
Sishen
9347ad57b1 sneaky erp 2019-06-01 20:20:55 -04:00
Sishen
9aaeed6f81 Update packs.dm 2019-06-01 19:46:09 -04:00
CalamaBanana
a37f84fb9b Ports RP Deer taur and adds Elf Ears to Mammals 
Ports RP Deer taur and adds Elf Ears to Mammals
 2019-06-01 17:28:17 +02:00
Trilbyspaceclone
d6486e2f6c Update resonator.dm 2019-05-31 23:13:31 -04:00
Trilbyspaceclone
78822d2e42 Update resonator.dm 2019-05-31 23:06:08 -04:00
kevinz000
70bad08f95 Merge pull request #8473 from Useroth/clown-fu 
[MERGE READY] Taeclowndo. Because Clowns deserve to have their own martial art too.
 2019-05-31 19:23:03 -07:00
Useroth
a46312ede6 Update godhand.dm 2019-06-01 04:20:27 +02:00
kevinz000
e63f9f385b Merge pull request #8359 from Useroth/pneumatic-and-stun-buff 
[MERGE READY]Reduces the complexity of the two new circuits: pneumatic cannon and stunner.
 2019-05-31 19:18:53 -07:00