cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-17 05:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

49 Commits

Author SHA1 Message Date
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
BongaTheProto
65b478f4ee Update pistol.dm 2022-08-12 18:03:07 -05:00
BongaTheProto
702b777171 Update ammo_boxes.dm 
*bruh
 2022-08-12 09:00:31 -05:00
CloverIsLucky
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
James
560b23592d More buyable stuff, new teleport gizmo, misc changes 2022-02-01 03:21:15 +00:00
radar651
538d3551f9 .45 Cal update 2.3 
Adds researchable .45 to the research station
 2022-01-25 07:32:57 -06:00
radar651
78884d808c .45 Caliber 2.0 Fix 
Fixes two issiues with 2.0
 2022-01-24 18:53:37 -06:00
radar651
13f0c2c70b .45 Caliber Update 2 
The second update to .45 Caliber pistols
 2022-01-24 11:54:09 -06:00
radar651
1116f69682 .45 Update 
Updates the .45 taser and .45 lethal
 2022-01-23 13:11:28 -06:00
BongaTheProto
00532beeea Merge branch 'master' into pr/138 2022-01-19 12:51:57 -05:00
BongaTheProto
adc469ae71 icons fixed 2022-01-19 12:49:24 -05:00
BongaTheProto
87700527e3 part 1 fix 2022-01-19 01:55:30 -05:00
radar651
150d3fa68f Final update to 48 
Fixed everything
 2022-01-18 22:10:21 -06:00
radar651
e2720e4146 UPdate 48 updated 
An update to 48
 2022-01-18 20:10:59 -06:00
E
ce4bef80f2 a 2022-01-14 22:48:17 +01:00
E
6b81cdcdc5 oh right 2022-01-11 20:44:10 +01:00
E
b188540454 yeah this took way too long to do 2022-01-10 23:51:03 +01:00
BongaTheProto
35a8291a35 Moved our modular folder under sandstorm's 
now we can modularize stuff better and have less errors I guess
 2021-12-10 14:31:15 -05:00