Commit Graph

1420 Commits

Author SHA1 Message Date
BongaTheProto
27a362e82d Merge pull request #399 from SPLURT-Station/donator-thingie 2022-07-05 17:52:29 -07:00
BongaTheProto
39876a7393 Merge pull request #398 from WoolyAypa/(hexa)crocin-pump
Minimal tweaks here and there for the (hexa)crocin pumps
2022-07-05 17:30:32 -07:00
BongaTheProto
5c11ed2cad more thingy
some organization and fleshlight yey
2022-07-05 19:16:34 -05:00
Pin-alternative
74eacf432a stop these 2022-07-06 09:39:57 +10:00
Pin-alternative
cc5f7d8a73 fn 2022-07-06 09:24:25 +10:00
BongaTheProto
095fd09f5b crnowwnb 2022-07-05 18:15:34 -05:00
BongaTheProto
3a955c9022 small cleanup 2022-07-05 17:16:29 -05:00
WoolyAypa
79c2e2b54f grammar. 2022-07-05 19:02:34 -03:00
WoolyAypa
f749a68b73 minimal tweaks here and there 2022-07-05 18:35:19 -03:00
Pin-alternative
ba1c639b58 Merge remote-tracking branch 'upstream/master' into cursed 2022-07-05 20:42:15 +10:00
Pin-alternative
50245ec870 mlem 2022-07-05 20:38:02 +10:00
BongaTheProto
1358a2712a Merge pull request #397 from WoolyAypa/(hexa)crocin-pump
(Hexa)Crocin Pumps
2022-07-04 23:24:09 -07:00
WoolyAypa
6cba464b02 modulabaaaaaa 2022-07-04 18:03:46 -03:00
WoolyAypa
8601c83e45 almost made poopsie 2022-07-04 16:39:54 -03:00
WoolyAypa
d4fa19d988 properly working now (no runtimes c: ) 2022-07-04 16:25:27 -03:00
WoolyAypa
0a52520870 renaming 2022-07-03 23:56:22 -03:00
WoolyAypa
16d82c1310 grammar and fixes 2022-07-03 23:43:15 -03:00
WoolyAypa
2bd1a27c0c oops, not sure why that's there 2022-07-03 23:06:53 -03:00
WoolyAypa
6158921be4 they see me pumpin' 2022-07-03 22:06:06 -03:00
BongaTheProto
465c7189eb penid
first ko-fi tier item added :3
2022-07-03 18:05:22 -05:00
Pin-alternative
3f93c010b9 fuck 2022-07-03 21:42:58 +10:00
BongaTheProto
737d4d3a4b beanb 2022-07-02 03:17:59 -05:00
BongaTheProto
d2e24e63b9 drinks
~
2022-07-01 00:37:11 -05:00
BongaTheProto
63e9e61921 file limits
because we don't need even more lag
2022-06-30 17:23:03 -05:00
Pin-alternative
a138482737 truly random 2022-06-30 16:55:48 +10:00
Pin-alternative
65c2bc56e7 thins 2022-06-30 15:34:53 +10:00
Pin-alternative
55068b24f0 Merge remote-tracking branch 'upstream/master' into cursed 2022-06-30 14:55:06 +10:00
BongaTheProto
58cabea49b Merge pull request #374 from AshTheDerg/master 2022-06-29 21:28:11 -07:00
BongaTheProto
b3fa2b31cb dring 2022-06-29 00:03:10 -05:00
BongaTheProto
1aa6c8f217 beanb 2022-06-28 15:07:09 -05:00
BongaTheProto
35b931ed75 Merge pull request #389 from CloverIsLucky/patch-1 2022-06-27 12:28:05 -07:00
Pin-alternative
d58455d082 doin 2022-06-27 10:56:30 +10:00
BongaTheProto
9528d129c3 Update psychologist.dm 2022-06-26 16:19:13 -05:00
CloverIsLucky
a259371d3d More ammo.
.22lr revolver looks underpowered, plz buff.
2022-06-26 05:08:55 -05:00
AshTheDerg
fcd43d6cc7 Peacekeeper Equipment Change 2022-06-25 08:48:59 -04:00
Pin-alternative
dd4a03878e eg 2022-06-25 21:47:45 +10:00
Pin-alternative
7f4f83e082 needed changes 2022-06-25 20:43:09 +10:00
AshTheDerg
582c26ba07 PK Equipment Change 2022-06-25 06:18:07 -04:00
AshTheDerg
999d0fbf31 Merge branch 'SPLURT-Station:master' into master 2022-06-25 06:17:23 -04:00
Pin-alternative
96e42080e0 eg 2022-06-25 18:24:16 +10:00
Pin-alternative
54df75d76f give it icons 2022-06-25 18:23:48 +10:00
Pin-alternative
280214e53a this 2022-06-25 18:20:45 +10:00
Pin-alternative
41b591a382 item 2022-06-25 18:17:32 +10:00
Pin-alternative
203f21c3d6 things 2022-06-25 18:11:35 +10:00
Pin-alternative
254a5350aa updatess 2022-06-24 21:20:17 +10:00
Pin-alternative
2a8a23dd30 Merge remote-tracking branch 'upstream/master' into cursed 2022-06-24 20:10:06 +10:00
Pin-alternative
d4ec28ae85 move some shiez 2022-06-24 20:08:09 +10:00
Pin-alternative
f59bb6032e get this stuff done 2022-06-23 20:07:12 +10:00
BongaTheProto
8893add4a0 todo: make this code better
but hey, it works for now
2022-06-22 18:17:57 -05:00
BongaTheProto
34c6184cd4 Merge pull request #378 from WoolyAypa/dumb4cum 2022-06-21 08:49:30 -07:00