Commit Graph
64 Commits
Author SHA1 Message Date
LagardereMathis 0c4fbe0914 Add diagonal bayonet and adds it to hunting rifle 2023-09-13 22:06:44 +02:00
BongaTheProto 35c3dd0288 salvaging
yippee
2023-09-05 18:14:31 -05:00
Vhariik 599be04e94 Update modpins.dm 2023-07-09 21:27:02 -03:00
Vhariik cd10df4246 Merge remote-tracking branch 'upstream/master' into Dum 2023-06-28 21:48:21 -03:00
Vhariik c40c24d02a . 2023-06-26 21:09:10 -03:00
Vhariik d4aa510b02 Firing pins now work properly 2023-06-16 13:51:19 -03:00
Vhariik bd65919db6 kaiju ammo box added aswell 2023-06-15 09:43:15 -03:00
Vhariik d6b06514cf Actually adds the ammo boxes for 5.43mm ammo 2023-06-15 01:59:25 -03:00
Vhariik f90766d361 Kaiju pin is now modular, hell yeah 2023-06-12 14:49:58 -03:00
Vhariik 8fc4e40aab Update rifle.dm 2023-06-06 11:25:28 -03:00
Vhariik 2490e5b5fd Kaiju event-only gun 2023-06-06 09:23:54 -03:00
Vhariik df49e38e6b Guess who forgot to add the bullet coding 2023-06-02 12:23:11 -03:00
Vhariik 1594b9b68c clockwork stuff added
clockwork simplemobs/boss and aegis dmr/assault rifle
2023-06-02 12:04:54 -03:00
Vhariik 279beb22b2 Added magazines
forgot to include mags lol
2023-05-22 18:00:26 -03:00
Vhariik 9a241c33aa Some stuff for map-editting
Mostly weapons and simple-mobs
2023-05-22 13:20:18 -03:00
Darius ad0239b5de Replace all modular HTML spans with defines spans
In total:
- Adds span defines for `reallybig hypnophrase`, `big warning`, `header`
- Fixes a missing apostrophe for hypno stare
- Makes a special exception for cuddling.dm, which uses an irregular span
- Puts the spans file back
2023-01-16 04:05:27 -05:00
BongaTheProto d972b715e2 fixes our reskins
btw cit's prs aren't making any changelogs for some reason just fyi
2023-01-11 13:44:42 -05:00
AshTheDerg b205a21ebb Merge remote-tracking branch 'upstream/master' into corpus-shit 2022-10-09 18:24:56 -04:00
AshTheDerg 7f2d5476b6 Corpus items and Mentor Mice
Adds Corpus items; Dera Energy Rifle, Prova Stunprod, and Ranger Hardsuit. Adds Mentor and Admin mice as a framework for later.
2022-10-09 17:40:07 -04:00
BongaTheProtoandGitHub 65b478f4ee Update pistol.dm 2022-08-12 18:03:07 -05:00
BongaTheProtoandGitHub 702b777171 Update ammo_boxes.dm
*bruh
2022-08-12 09:00:31 -05:00
CloverIsLuckyandGitHub a259371d3d More ammo.
.22lr revolver looks underpowered, plz buff.
2022-06-26 05:08:55 -05:00
BongaTheProto d151f761e7 some adds 2022-05-18 19:18:08 -05:00
BongaTheProto 090e148614 Revert "it compiles"
This reverts commit c393b81066.
2022-05-16 14:59:10 -05:00
BongaTheProto c393b81066 it compiles
blueshield part 1
2022-05-14 22:02:22 -05:00
JessieProudmore 6d7f86416d Stun/less-lethal fix
Tweaks to some projectiles and taser electrodes
2022-05-07 20:09:31 +02:00
BongaTheProto 4f0a58c980 small follow-up fixes
to a4fac709c3
2022-04-09 12:16:19 -05:00
radar651 0c0081c29e Update shotgun.dm 2022-04-05 16:01:42 -05:00
radar651 314efe3b11 Update shotgun.dm 2022-04-05 16:00:44 -05:00
radar651 32b065eeb1 Luger fix
Fixes the luger
2022-04-05 05:55:24 -05:00
radar651 076e12a829 Ready
Ready for test merg
2022-04-04 16:20:45 -05:00
radar651 ea41cd0bd8 Merge branch 'master' into generalupdates 2022-04-03 09:26:03 -05:00
radar651 0fb8e390d5 initial 2022-04-03 09:25:39 -05:00
radar651 ed4e9b45a3 Fixes
Some presalt fixes
2022-03-31 02:59:16 -05:00
radar651 d9f9f2b6fe Redadds .45 lethal
Redadds .45 lethal tot he hacked autolathe
2022-03-29 08:08:06 -05:00
radar651 4faefc407c Brushgun fix
Fixes the damn brush gun
2022-03-29 07:53:19 -05:00
radar651 702480eb4d Update rifle.dm 2022-03-27 20:09:11 -05:00
radar651 f6bc0367c6 Update shotgun.dm 2022-03-26 19:51:05 -05:00
radar651 d676ad6ece Boost stam damnage on .45 long 2022-03-26 18:21:10 -05:00
radar651 c921f9e9e4 Update pistol.dm 2022-03-26 18:07:56 -05:00
radar651 86cf557afd Update ammo_boxes.dm 2022-03-26 06:16:32 -05:00
radar651 f816373439 Ready for merg
At least I hope so
2022-03-26 05:21:06 -05:00
radar651 d01a0c9d7c HOly shit
I am doing a lot
2022-03-24 09:48:55 -05:00
radar651 f1ca72a823 Prioty Push
Priorty update due to exploits. Even by an admin at this point.
2022-02-28 13:00:11 -06:00
radar651 e25ba06a1c Removes the antuiqe
Removes the copy
2022-02-26 13:30:00 -06:00
radar651 6080145e15 final updates
Final updates before PR
2022-02-25 18:58:49 -06:00
radar651 2b7ba387f8 Guns guns guns
Lots of guns and some knives
2022-02-25 13:55:13 -06:00
radar651 a8b9877333 Oops
Once again, I am an idiot
2022-02-10 21:16:17 -06:00
radar651 4413af0bdb Update pistol.dm 2022-02-10 21:12:11 -06:00
radar651 4350a1fd6d Jobs and Holster Update 2
A massive job update, some buffing, some nerfing, some new things
2022-02-09 15:34:58 -06:00