shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,978 Commits 5 Branches 0 Tags
166370fb6c62beb8cc8488710c9ffbf9c511ff1c
Commit Graph

343 Commits

Author SHA1 Message Date
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
kevinz000
2139bfdb5f Merge pull request #11290 from Putnam3145/traitor-types 
Traitor classes: a new paradigm.
 2020-03-15 01:35:30 -07:00
Seris02
48076c921d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers 2020-03-14 11:41:39 +08:00
kevinz000
ce8de536b5 Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-10 17:24:09 -07:00
necromanceranne
b03d83926a Forgot the scroll 2020-03-10 20:27:40 +11:00
Kraseo
a5ef41c0fc adjust numbers, fix shuttle dropoffs 2020-03-07 20:31:49 +01:00
Putnam
71ac07426a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types 2020-03-06 17:03:24 -08:00
Kraseo
ab48a6fa16 part 3: do people even read commit logs 2020-03-01 19:14:05 +01:00
Kraseo
d93ade7e03 part 2: bloody tendency 2020-03-01 17:37:18 +01:00
Kraseo
38f7821dd6 part 1: battle stream 2020-03-01 16:56:13 +01:00
Putnam
f344af633f finalized. 2020-02-29 23:29:24 -08:00
kevinz000
7c8b9828cd Merge branch 'master' into eldritch_affairs 2020-02-19 18:57:32 -07:00
necromanceranne
5c2e244ee0 Ports /tg/ pr #44529, reverts #9092 2020-02-16 22:20:50 +11:00
kevinz000
c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup 
Hijack Implant
 2020-02-10 04:16:14 -07:00
kevinz000
c3eaa0fcbd Merge pull request #10948 from Citadel-Station-13/Ghommie-patch-1 
Prevents certain unpurchasable discounts.
 2020-02-10 04:11:35 -07:00
Arturlang
29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02:00
Seris02
83813d24c8 forgot that shit again 2020-02-09 17:07:39 +08:00
Seris02
366075b38e yeet forgot this 2020-02-09 13:10:28 +08:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000
de2a3c5502 Merge pull request #10787 from Seris02/snatchgloves 
thief's gloves
 2020-02-06 23:53:54 -07:00
Ghom
fc1c97b6c6 [s] Prevents some unachievable discounts. 2020-02-07 06:11:20 +01:00
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00