shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,303 Commits 5 Branches 0 Tags
b3afed69f44f6b8564951ebeef06f7acf8beefaf
Commit Graph

364 Commits

Author SHA1 Message Date
Ghom
fc980b31c2 I did a typo. 2020-05-14 13:44:06 +02:00
Ghom
ce2bb9ff84 Kevinz "the braveless" 000's suggestion. 2020-05-14 13:43:36 +02:00
Ghommie
88e499a39a Some quick economy fixes and improvements. 2020-05-13 03:31:16 +02:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
kappa-sama
cab55f8549 alternate buff (#11867) 2020-05-09 02:14:18 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Sishen
37d1c469ea hnmhm cultplain?? 2020-05-01 06:59:54 -06:00
kevinz000
af08e0fecf Merge pull request #11984 from Hatterhat/fastpump 
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
 2020-04-25 17:07:29 -07:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
kevinz000
cf61795101 Merge pull request #11941 from kiwedespars/punch-bundle 
re-adds north star gloves to traitors for 20 tc
 2020-04-23 11:45:04 -07:00
Hatterhat
c686ed193b a book about mashing Z and LMB 2020-04-22 17:55:11 -05:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Ghommie
c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
kevinz000
33cfb9a566 Merge pull request #11920 from Ghommie/Ghommie-cit691 
Removing troublesome and filler uplink items.
 2020-04-20 11:34:44 -07:00
kiwedespars
42fac43807 Merge branch 'master' into punch-bundle 2020-04-19 16:50:01 -07:00
kiwedespars
2c362dd84f Update uplink_bundles.dm 2020-04-19 15:58:31 -07:00
Putnam
9976fab42b Made traitor classes rerollable, reassignable by admins 2020-04-18 14:40:41 -07:00
Ghommie
811f65e48b Removing troublesome and filler uplink items. 2020-04-18 19:51:09 +02:00
Artur
eafc69aa65 Reviewer suggestion, reduces paralyze 
And ports that commit that ghommie said
 2020-04-17 16:22:15 +03:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
kevinz000
3ec71612e7 Update uplink_bundles.dm 2020-04-14 01:49:14 -07:00
Seris02
f158536e59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers 2020-04-13 11:10:24 +08:00
Seris02
b9c9991a5d merge fix 2020-04-13 10:57:09 +08:00
Ghom
b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs 
Eldritch Affairs
 2020-04-12 20:47:19 +02:00
kevinz000
bfad661c1c Merge pull request #11737 from Trilbyspaceclone/patch-330 
Buffs Stimpacks
 2020-04-09 06:57:13 -07:00
kevinz000
22bf4cdb83 Merge pull request #11760 from Trilbyspaceclone/10mmchanges 
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
 2020-04-09 02:38:44 -07:00
kevinz000
956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening 
Punch Changes 2: The Quickening
 2020-04-09 02:09:51 -07:00
necromanceranne
eece94caf3 puts a pop cap on the various martial arts. 2020-04-07 00:28:09 +10:00
TrilbySpaceClone
2cd59a6fb0 that was easy 2020-04-06 08:40:34 -04:00
Trilbyspaceclone
31c7d70eb1 words are hard 2020-04-04 04:32:59 -04:00
Trilbyspaceclone
48f458cddb Update uplink_devices.dm 2020-04-04 00:09:02 -04:00
necromanceranne
0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11:00
kappa-sama
2eda92ed73 yeah (#11668) 2020-03-30 17:52:31 +02:00
kevinz000
03d87f6bdc Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-29 20:44:49 -07:00
necromanceranne
a4313ee101 Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink (#11675) 2020-03-29 17:45:01 +02:00
necromanceranne
3ddfbe0e29 Null Crate removal (#11672) 2020-03-29 17:16:58 +02:00
kevinz000
c39dd52b5f Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-27 21:32:40 -07:00
Kraseo
8d6f2fbab5 this was a bad idea (#11594) 2020-03-25 04:05:14 +01:00
ZeroMan
a5f988e0be fuck me up fam 2020-03-21 19:43:43 -04:00
ZeroMan
6c5160ee5c i hurt myself today 2020-03-21 02:18:44 -04:00
ZeroMan
93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies 
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
 2020-03-21 02:17:13 -04:00
kevinz000
8a8b6efb39 Merge pull request #11537 from Trilbyspaceclone/patch-317 
Badass Glasses
 2020-03-20 22:54:28 -07:00
ZeroMan
5039bcad7e i need an ambulance 2020-03-20 13:39:20 -04:00
ZeroMan
b30f10742b i actually am hurt 2020-03-20 13:38:08 -04:00
ZeroMan
bc5e850516 i still feel pain 2020-03-20 13:35:55 -04:00
necromanceranne
570f6e8a66 Plastitanium Rapier: Sleepy Edition (#11507) 
* knockout rapier, improved sprites

* it's a rapier not a foil those aren't synonyms

* whoops

* needs it's shanking sound

* Put a stamina loss threshold onto the swords slep so you need at least two hits to proc the sleep. Don't get stabbed more than once!

* Update items_and_weapons.dmi

* Removes chat spam and also frankly it doesn't need drowzy on top
 2020-03-20 16:07:04 +01:00
ZeroMan
dd40bc28c1 and here we go 2020-03-19 22:17:43 -04:00
ZeroMan
35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
Trilbyspaceclone
64ccb99724 Update uplink_badass.dm 2020-03-19 18:00:45 -04:00
necromanceranne
6f0fc2bdea I LOVE YOU KITCHEN GUN! 2020-03-17 03:20:53 +11:00