Commit Graph

1287 Commits

Author SHA1 Message Date
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
Solaris-Shade
a4f8789d68 DO it not HIT it!
https://github.com/tgstation/tgstation/pull/65061
2022-03-24 22:43:17 -04:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade
0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade
171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -05:00
Solaris-Shade
c5be81c589 tg moved projectiles out of /item, added '/item' back 2022-03-06 16:29:58 -05:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
Solaris-Shade
8b77ee159f Update projectile.dm
Delete redundant list
2022-02-22 14:57:08 -05:00
SpiWat
45c7ec0fdb The book has 10 pagess remaining. 2022-01-24 20:39:52 -05:00
silicons
03e8c32acd Merge pull request #15402 from Linzolle/pinremoval
finally change pin removal from crafting to tools
2021-12-19 18:54:50 -08:00
Lin
5dc9704e5d Merge pull request #15380 from DeltaFire15/oops-all-wounds
Block & Pellet wound pass
2021-11-30 20:24:42 +00:00
Linzolle
c2378d3f26 helmet stuff 2021-11-29 17:40:08 -07:00
Linzolle
9807a2f9e0 pin removal and gun examine things 2021-11-29 17:22:13 -07:00
Putnam3145
1e01852b93 Merge pull request #15320 from shellspeed1/working-on-new-fancy-syringe-guns
Improvements to the reagent gun and brand new smart dart repeater. [Ready]
2021-11-17 17:09:23 -08:00
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
DeltaFire
ef9c90d512 embeds, unarmed and wounds 2021-11-16 20:26:38 +01:00
DeltaFire
6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
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
silicons
186b552103 merge 2021-10-29 21:50:58 -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
keronshb
3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04: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