silicons
|
67c002de7a
|
Merge pull request #12817 from kappa-sama/patch-34
boosts stimpak cost back up to 5 from 3
|
2020-07-26 22:51:24 -07:00 |
|
silicons
|
aa3cc9fae8
|
Merge pull request #12824 from kappa-sama/patch-35
makes brainwashing disk role restricted and debuffs its price
|
2020-07-20 17:25:53 -07:00 |
|
kappa-sama
|
ba15c17e02
|
here
|
2020-07-19 15:14:44 -04:00 |
|
kappa-sama
|
26a240ddb9
|
bye
|
2020-07-19 15:14:12 -04:00 |
|
kappa-sama
|
38f05bf230
|
6 because i feel like it
|
2020-07-19 04:37:51 -04:00 |
|
kappa-sama
|
6075af8eb0
|
nerfies
|
2020-07-19 04:28:44 -04:00 |
|
kappa-sama
|
f2e039a743
|
back up to 5
|
2020-07-18 17:42:35 -04:00 |
|
kappa-sama
|
0364fe8579
|
lower cost
|
2020-07-18 03:50:17 -04:00 |
|
silicons
|
b98102a824
|
Merge pull request #12762 from zeroisthebiggay/a
drops martial art minpops down to twenty pop
|
2020-07-17 17:11:02 -07:00 |
|
zerothebigboy
|
3ccd994080
|
a
|
2020-07-13 13:52:56 -04:00 |
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
DeltaFire
|
82d21e4824
|
smol fix
|
2020-06-21 03:44:12 +02:00 |
|
Timothy Teakettle
|
4c55e86da7
|
part 2
|
2020-06-10 23:14:25 +01:00 |
|
b1tt3r1n0
|
764ba26ace
|
Pouches (#12432)
* The Ammo Pouch
It holds magazines and most forms of ammo.
* The Ammo Pouch
It holds magazines and most forms of ammo.
|
2020-06-09 03:22:39 -07:00 |
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
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 |
|