shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,069 Commits 5 Branches 0 Tags
02eb4685a93d2d4be77aa03e1df034fc376a02cb
Commit Graph

1239 Commits

Author SHA1 Message Date
silicons
f623d6e7eb Merge pull request #15229 from Hatterhat/perhaps-i-was-a-bit-too-harsh 
vareditable clip reloading delay for shotguns
 2021-10-11 20:46:06 -07:00
silicons
91e7cb293c Merge pull request #15223 from Hatterhat/yeehaw-box 
The Yeehaw Update - makes .38 lever-actions slightly more accessible
 2021-10-11 20:45:42 -07:00
Hatterhat
20087a06a8 superglued stock 2021-10-08 00:15:35 -05:00
Chayse Ramsay
76fa85e683 Cyborg module sorting fixed (#15241) 2021-10-06 17:16:10 +02:00
Chayse Ramsay
4d2e81d73c newline 2021-10-05 02:52:50 +01:00
Chayse Ramsay
6f0722ab48 Ammo box sprite fixed 2021-10-04 18:36:17 +01:00
Hatterhat
02abdd4eef oh i forgot to commit this before i made the pr 2021-09-30 23:22:45 -05:00
Hatterhat
87e1b80000 adds vareditable clip delay 2021-09-30 23:16:19 -05:00
Hatterhat
1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
silicons
b7476491d3 Merge pull request #15204 from Hatterhat/clip-delay 
shotgun shell clips now have melee click delay (0.8s) with this one weird trick
 2021-09-28 00:13:02 -07:00
Hatterhat
e141df3600 weirdchamp 2021-09-24 23:16:46 -05:00
Hatterhat
fd6e97b935 grr 2021-09-24 23:08:15 -05:00
Hatterhat
784cd2ca7d ballin 2021-09-24 19:12:04 -05:00
kiwedespars
f3550fd87c blacklists morphine from dart guns, also haloperidol (#15152) 
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* yeag

* actually adds the blacklist

can't you feel my heart beat so, i can't let you go, want you in my life

* changes

* Update html/changelog.html

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-09-17 12:54:02 +02:00
Cognition
fc2e101402 Fixes updates for rechargers & energy guns, ports finish recharging msg 2021-08-28 19:24:29 -07:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates 
Ports update appearance
 2021-08-08 04:06:18 -07:00
silicons
2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit 
[READY] tempgun rebalance (it's not a nerf don't worry)
 2021-08-02 17:11:20 -07:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
silicons
a5a476f457 cyborg shovies 2021-06-28 13:10:40 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
zerothebigboy
1fa4ac60cb i need a nap 2021-06-10 15:16:36 -04:00
zerothebigboy
fa738856bf i need a nap 2021-06-10 03:22:34 -04:00
silicons
09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon 
New Challenger: The Cat Surgeon has appeared! (Ready!)
 2021-06-09 11:29:24 -07:00
silicons
716c2a04e4 Merge pull request #14160 from keronshb/motivation 
Adds a new traitor item, Motivation (Part 1)
 2021-06-09 11:10:17 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
WanderingFox95
7884ccf316 Only 5 units are necessary, so why keep it at 10? 
I mean, this is the refining process
 2021-06-05 14:51:59 +02:00
WanderingFox95
e69729beb4 So he doesn't need sodium thiopental after all. 
Turns out Furranium has a knockdown.
 2021-05-31 12:15:16 +02:00
WanderingFox95
ae2970f318 Adds a special Catranq Dart 2021-05-30 21:17:03 +02:00
Putnam
9040c08698 whoops i forgot the var 2021-05-30 00:38:07 -07:00
Putnam
2ab05d1247 makes sniper zooming work 2021-05-30 00:31:20 -07:00
silicons
4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1 
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
 2021-05-07 18:42:24 -06:00
silicons
d4529b1bf3 Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance 
The reagent dart gun uplink item needed work.
 2021-04-28 21:17:36 -06:00
silicons
1585d1c2be fixes 2021-04-26 23:32:33 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
WanderingFox95
4e0bf12c0c Modifies dart size and properties 
They inject less but pierce again
 2021-04-23 23:15:40 +02:00
WanderingFox95
1d42e9f4e0 Adjusts projectile count and delay 2021-04-23 23:12:58 +02:00
The0bserver
6b4051071d Finally, ammo for the funny gun. 2021-04-21 10:46:04 -04:00
The0bserver
146ffcd2bd tweaks 2021-04-21 09:58:08 -04:00
The0bserver
db046f3dbb I want to play Thermonuclear War (Initial Commit) 2021-04-21 03:12:01 -04:00
The0bserver
57e0056ffc Spain without the S (Initial Commit) 2021-04-21 01:46:33 -04:00
The0bserver
34e6a179ad By popular request 2021-04-17 21:29:19 -04:00
keronshb
20c190c17d Merge remote-tracking branch 'upstream/master' into motivation 2021-04-14 17:55:24 -04:00
The0bserver
6be351ecb6 I will try this. 2021-04-14 01:48:18 -04:00
The0bserver
f16c6931e2 Fixes, removes the functionality after confering. 2021-04-13 23:50:11 -04:00
The0bserver
27c49b3f34 fox fix 2021-04-13 23:38:50 -04:00
The0bserver
64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
The0bserver
b1fd4a33a2 funny gold sound 2021-04-11 20:30:10 -04:00
The0bserver
1d31fb084f More concealment, fixes a problem with the .45-70 2021-04-11 19:40:54 -04:00
The0bserver
9fe8fb7671 More work 2021-04-11 07:20:06 -04:00