shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,198 Commits 5 Branches 0 Tags
8ab281dfd6a4293d7dcff12ed20401e10be12e28
Commit Graph

1266 Commits

Author SHA1 Message Date
shellspeed1
8ab281dfd6 make hot swap work properly 2021-11-12 19:21:45 -08:00
shellspeed1
e3407c5b39 unfucks a few things post comments. 2021-11-12 19:00:17 -08:00
shellspeed1
030f078445 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:22:32 -08:00
shellspeed1
f67cf99757 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:22:19 -08:00
shellspeed1
329336f5ed Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:19:06 -08:00
shellspeed1
6363d9a447 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:18:35 -08:00
shellspeed1
b8078d0a63 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:18:29 -08:00
shellspeed1
47da4007f7 Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:18:04 -08:00
shellspeed1
5ae433138e Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:17:32 -08:00
shellspeed1
dc3e651674 Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:16:39 -08:00
shellspeed1
9c7f1fdfca Update code/modules/projectiles/guns/misc/chem_gun.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:16:21 -08:00
shellspeed1
142b74ed5d Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:15:07 -08:00
shellspeed1
580e398e38 minor bug fix, also inhand sprites 2021-11-04 02:33:12 -07:00
shellspeed1
3090194042 adds sprite 2021-11-03 18:48:38 -07:00
shellspeed1
973d471dd4 woopsie 2021-10-31 05:04:08 -07:00
shellspeed1
026ce5dec4 tiny bit more polish, some number tweaks, and research. 2021-10-31 04:18:15 -07:00
shellspeed1
f148eb0a4c minor cleanup 2021-10-31 03:24:24 -07:00
shellspeed1
027509b55a reloading fix 2021-10-31 03:16:24 -07:00
shellspeed1
7166ead8bd Uses vial as chem pool. 2021-10-31 01:28:49 -07:00
shellspeed1
56fcd2dc9f basic ability to load hypovial added 2021-10-31 00:48:56 -07:00
shellspeed1
fb7d2a8ef3 smart dart initial 2021-10-30 19:35:09 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
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
SandPoot
829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
SandPoot
437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03: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
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03: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