Commit Graph

118 Commits

Author SHA1 Message Date
Hatterhat
2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03: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
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
1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07: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
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
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
The0bserver
bdaf0987e4 im going insane 2021-04-11 05:31:23 -04:00
The0bserver
e75088420d Error fixing. 2021-04-11 04:38:46 -04:00
The0bserver
55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
Hatterhat
30a9ad5059 yeehaw :) 2021-03-23 18:55:00 -05:00
Hatterhat
6bac90f8de uhh initial commit ig 2021-03-22 21:23:00 -05:00
silicons
15dd80a085 less awful 2021-03-20 13:39:59 -07:00
dzahlus
594aa9b3c0 sorry no funny taser 2021-03-03 01:34:19 +01:00
dzahlus
d214392a9c Update rechargable.dm 2021-03-02 18:18:23 +01:00
dzahlus
f0a34723d7 tase lase 2021-03-01 23:58:29 +01:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
silicons
adc75a1d50 Merge branch 'master' into revert-13122-haha 2020-08-28 15:31:38 -07:00
silicons
ff6beea525 rebalances shotgun shell stripper clips since no one else wants to (#13116)
* Update volumetrics.dm

* Update ammo_boxes.dm
2020-08-26 17:19:29 +02:00
lolman360
ee4da21d38 Merge branch 'haha' of https://github.com/lolman360/Citadel-Station-13 into haha 2020-08-19 12:20:38 +10:00
lolman360
f35989b09e Merge remote-tracking branch 'upstream/master' into haha 2020-08-19 12:20:07 +10:00
lolman360
09bba25050 Update code/modules/projectiles/boxes_magazines/_box_magazine.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-19 12:02:45 +10:00
lolman360
a7a964154e Update code/modules/projectiles/boxes_magazines/_box_magazine.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-19 12:02:34 +10:00
lolman360
6f21b23a87 Fixes Shit. 2020-08-18 14:28:57 +10:00
lolman360
8027706bea Update _box_magazine.dm 2020-08-18 13:45:44 +10:00
lolman360
2d1edc9fa2 Update _box_magazine.dm 2020-08-18 13:30:49 +10:00
silicons
50eca19658 Revert "load_delay var for /obj/item/ammo_box, nerfs shotgun stripper clips (hatter why'd you pr them)" 2020-08-17 20:20:04 -07:00
silicons
d35cba095f Merge pull request #13108 from Hatterhat/357-dumdum
.357 DumDum Rounds (they're adminspawn only don't worry)
2020-08-17 08:58:00 -07:00
lolman360
3aba9eb5a6 kee 2020-08-12 15:11:55 +10:00
lolman360
8c70b56706 whoops 2020-08-11 19:04:59 +10:00
lolman360
472ef6165f imamurderer 2020-08-11 18:52:26 +10:00
Hatterhat
8370a31942 funny adminspawn wound bullets 2020-08-10 12:12:32 -05:00
silicons
6876edbd85 Merge pull request #12992 from Hatterhat/rifle-book-pt2
unatomic as shit PR about nukie guns
2020-08-06 19:40:09 -07:00
Hatterhat
6a5e26eb1c unatomic as shit 2020-08-01 12:31:13 -05:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
YakumoChen
d9e5847b8f Update pistol.dm 2020-07-01 08:56:13 +00:00
YakumoChen
6a48b9199f Update ammo_boxes.dm 2020-07-01 08:55:42 +00:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00