Commit Graph

1420 Commits

Author SHA1 Message Date
Bob
a474235a4f yea 2022-04-16 00:02:07 -03:00
TemptStation
189ae2442d Merge pull request #15 from NullFag/un_lanceify_blueshield
Remove Blueshield Alt Title
2022-04-14 16:16:46 -07:00
nullfag
95540efb2e removes a shit alt title 2022-04-15 01:06:13 +02:00
TemptStation
9b63431a50 Merge pull request #5 from NullFag/kill_me
smexi fix
2022-04-15 00:40:12 +02:00
Prods
54f2cee5b8 Update splurt_comms.dm
Adds https://github.com/crossedfall/crossed-cogs requirement for status cog into splurt_comms.dm
2022-04-14 17:59:07 -04:00
Prods
f2a127cdf5 Update kinkmate.dm
Commented out duplicate item listing.
2022-04-14 16:22:40 -04:00
BongaTheProto
2a346da0f7 ass 2022-04-11 18:13:43 -05:00
BongaTheProto
34e9d79c54 events 2022-04-11 15:16:44 -05:00
Bob
f617fafb29 adds cuddling 2022-04-10 17:57:09 -03:00
BongaTheProto
79d4e73bde werb thing 2022-04-10 15:37:29 -05:00
BongaTheProto
032a0c1cf6 Merge pull request #277 from AManWithAToolbox/ashie
Small ashie update
2022-04-09 12:24:47 -05:00
BongaTheProto
4f0a58c980 small follow-up fixes
to a4fac709c3
2022-04-09 12:16:19 -05:00
AManWithAToolbox
fc962c2680 update 2022-04-08 15:49:50 -05:00
BongaTheProto
0990055d4b Modular icon stuff, i think
this should do it without editing classes that aren't supposed to be edited
2022-04-07 09:36:47 -05:00
BongaTheProto
bb7f0f506d Merge pull request #271 from StrangeWeirdKitten/New-Markings
New Body Mark + Adjustments
2022-04-06 18:07:36 -05:00
BongaTheProto
9db6eccd75 Merge pull request #268 from radar651/generalupdates
General updates
2022-04-06 17:47:58 -05:00
BongaTheProto
70962e9f0a people are still kinda dumb
now it should be ok
2022-04-06 16:46:21 -05:00
BongaTheProto
dce84a3226 Update statues.dm 2022-04-06 16:18:22 -05:00
StrangeWeirdKitten
3c858d5d67 done 2022-04-06 13:49:21 -06: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
StrangeWeirdKitten
2db5f984a6 Sprite Work 2022-04-04 20:15:10 -06:00
StrangeWeirdKitten
4f6a416b92 Update body_markings.dm 2022-04-04 19:16:48 -06:00
radar651
ded652dd1d Merge branch 'master' into generalupdates 2022-04-04 16:26:16 -05:00
radar651
076e12a829 Ready
Ready for test merg
2022-04-04 16:20:45 -05:00
BongaTheProto
b3249a6d2d Update discord.dm 2022-04-04 09:25:30 -05:00
BongaTheProto
c6d42b3f1c No longer an useless command
Like seriously, why did they make deverify so useless in first place?
2022-04-03 15:59:30 -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
BongaTheProto
bfab81f192 Merge branch 'master' into anti-retard 2022-04-02 22:39:05 -05:00
BongaTheProto
b12b31ec13 Merge branch 'master' into anti-retard 2022-03-31 17:11:37 -05:00
radar651
ed4e9b45a3 Fixes
Some presalt fixes
2022-03-31 02:59:16 -05:00
BongaTheProto
0293cf9485 update 2022-03-31 00:15:18 -05:00
radar651
069ec135bc Damnit Sandstorm
Sandstorm broke it, I unbroke it
2022-03-29 19:28:28 -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
74766c94f2 Merge branch 'SPLURT-Station:master' into cargonia 2022-03-28 18:23:08 -05:00
radar651
b2e58b0681 Fixes
Adjust some RNG tables and location of some thigns not being in the Syndi section when they are suppose to be.
2022-03-28 17:54:56 -05:00
radar651
702480eb4d Update rifle.dm 2022-03-27 20:09:11 -05:00
radar651
e810701021 Balance
God I love balancing /s
2022-03-27 20:06:04 -05:00
BongaTheProto
6fdb73e091 Update pen.dm 2022-03-27 15:17:00 -05:00
BongaTheProto
0f005c354f hypercode moment 2022-03-27 15:16:01 -05:00
BongaTheProto
a7117714a8 Update pen.dm
fixxxxx
2022-03-27 14:11:20 -05:00
BongaTheProto
24606c47bf this is probaby better 2022-03-27 11:42:39 -05:00
BongaTheProto
9bbb96a376 Bodywriting
now available to genitals!
2022-03-27 03:33:28 -05:00
BongaTheProto
dfc0c5f99b what the fuck is a werefox
it kinda looks hot tho
2022-03-26 22:29:00 -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