Commit Graph

1420 Commits

Author SHA1 Message Date
BongaTheProto
bd937bf897 not needed 2022-08-16 00:34:13 -05:00
Aypa
c989c1c3aa color_src is unnecessary in this case 2022-08-15 12:36:25 -03:00
Aypa
a4015f9949 ugh fiiine 2022-08-15 01:42:21 -03:00
Pin-alternative
bc9da6c9ad inherit 2022-08-15 08:43:20 +10:00
Pin-alternative
2c4c8d0971 arght 2022-08-15 08:13:17 +10:00
Pin-alternative
9ba41fb085 Merge remote-tracking branch 'upstream/master' into cursed 2022-08-15 07:55:25 +10:00
Aypa
eb94dc79c4 fixing sum conflicts 2022-08-14 17:00:11 -03:00
Aypa
e837ea991e Merge branch 'master' into esthetic-help 2022-08-14 16:54:21 -03:00
BongaTheProto
1a44bd3013 Merge pull request #434 from SPLURT-Station/spriting-thingies
Spriting thingies and other updates
2022-08-14 14:14:25 -05:00
BongaTheProto
e21a7ae38a emote felix asked for
You can guess what it is
2022-08-14 10:46:05 -05:00
BongaTheProto
bf2cd05560 lewd medipens
adds lewd donator medipens like that one donator asked for
2022-08-14 03:31:20 -05:00
WoolyAypa
49c11f8fc0 O₃ 2022-08-13 23:35:33 -03:00
WoolyAypa
29e06bcc40 Par Piipa Papi Hapi... Papi Parpi Pipi Penis? 2022-08-13 23:12:46 -03:00
WoolyAypa
8c3350e9d6 new hairstyles ( i miss the barber job :< ) 2022-08-13 23:11:19 -03:00
WoolyAypa
b91aec0f2f succubus n' dragon tails 2022-08-13 23:10:48 -03:00
WoolyAypa
ce030e4df6 Albedo horns 2022-08-13 23:10:14 -03: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
BongaTheProto
0e6e08de35 Merge branch 'master' into spriting-thingies 2022-08-10 22:11:09 -05:00
BongaTheProto
63ff25b599 Merge branch 'master' into new-mech 2022-08-08 20:17:31 -05:00
BongaTheProto
fe7914e203 Merge branch 'master' into spriting-thingies 2022-08-08 19:58:45 -05:00
Pin-alternative
095c939c35 mhmm 2022-08-08 13:26:46 +10:00
BongaTheProto
7717cd566c Modularize custom spawntext
old change
2022-08-07 22:24:22 -05:00
Pin-alternative
4a3f7feebc allowed to fail 2022-08-08 13:21:21 +10:00
Pin-alternative
e055a91f78 add 2022-08-08 13:14:18 +10:00
Pin-alternative
db80942471 stuff inflation 2022-08-08 12:39:04 +10:00
Pin-alternative
fac4d833a2 size 2022-08-08 12:04:58 +10:00
Pin-alternative
84a266fc3f no double override 2022-08-08 11:58:51 +10:00
BongaTheProto
83e5caff9f binary cloak
doesn't work as intended with dullahans
2022-08-07 20:24:06 -05:00
Pin-alternative
4e838fca7b dedup that 2022-08-08 11:03:53 +10:00
Pin-alternative
b7bfeefcab fixess 2022-08-08 10:17:57 +10:00
Pin-alternative
9b07c85fcc grads 2022-08-08 09:12:52 +10:00
Pin-alternative
4ad46f4f5f Merge remote-tracking branch 'upstream/master' into cursed 2022-08-08 08:04:31 +10:00
Pin-alternative
94854d895f normal eggs have this 2022-08-08 08:03:54 +10:00
BongaTheProto
8aad94866a podpeople hairs + markings
me omw to force all pod players to change their species
2022-08-07 16:59:33 -05:00
BongaTheProto
f3239d778c Merge branch 'master' into spriting-thingies 2022-08-07 13:47:38 -05:00
BongaTheProto
9901158aba Update negative.dm 2022-08-07 00:13:00 -05:00
BongaTheProto
52431b4e63 Merge branch 'master' into spriting-thingies 2022-08-06 19:46:28 -05:00
BongaTheProto
07124f9472 New social anxiety
something tells me people will regret this rather quickly
2022-08-06 19:46:17 -05:00
BongaTheProto
31ca591707 dumb people can still shoot guns
tho they also do dumb stuff with them tbh
2022-08-06 18:14:09 -05:00
BongaTheProto
509b8df511 Modularize everything
this seems to be working I thibk
2022-08-06 17:35:53 -05:00
BongaTheProto
960fe53353 Update weapons.dm 2022-08-06 12:50:12 -05:00
BongaTheProto
bf8b463a08 Merge pull request #416 from SPLURT-Station/updates 2022-08-03 16:04:50 -05:00
Pin-alternative
32018d15dc Merge remote-tracking branch 'upstream/master' into cursed 2022-08-02 10:26:30 +10:00
Pin-alternative
6951f69c2b you can hit others now 2022-08-02 10:24:20 +10:00
BongaTheProto
5a132e0104 Merge pull request #422 from Crowbar764/command-communications 2022-07-31 12:29:38 -05:00
BongaTheProto
24af5074c9 Merge branch 'master' into updates 2022-07-30 16:13:39 -05:00
James
f771ad67e4 Version 01 2022-07-30 18:07:13 +01:00
BongaTheProto
6f97d25a99 Merge pull request #415 from AsherAshenclaw/yippee-vsauce-emotes
Yippee and vsauce emotes
2022-07-30 11:12:38 -05:00
Pin-alternative
095ffbd8a8 testers 2022-07-29 23:41:17 +10:00