Commit Graph

28420 Commits

Author SHA1 Message Date
DrPainis
1b8ef53014 maybe makes this compile 2021-05-27 00:55:41 -04:00
DrPainis
cbb7673e79 Adds the actual event.
Yes, cat meteors have the same announcement as carp.
2021-05-27 00:30:29 -04:00
DrPainis
98d5499712 adds the cat wave_type 2021-05-27 00:25:55 -04:00
DrPainis
d199f0585a adds cat meteors
because funny
2021-05-27 00:23:24 -04:00
keronshb
7dbab19597 Fixes the linters and adds a proper async 2021-05-27 00:14:43 -04:00
silicons
3c42247870 fix 2021-05-26 20:19:47 -07:00
keronshb
78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04:00
Arturlang
71a8c08e22 A lil more 2021-05-26 18:40:59 +03:00
Artur
673a322cbb changes cost of two uplink items 2021-05-26 18:29:18 +03:00
Kraseo
c3bfbac89a this time for real 2021-05-26 01:43:45 +02:00
Kraseo
7173bfade5 this is why i don't do webedits 2021-05-26 00:35:49 +02:00
Kraseo
3b5f391843 Merge branch 'master' into no-bloodcrawlies 2021-05-26 00:29:20 +02:00
Kraseo
7e2e608784 fixes slamming people into walls and such while bloodcrawled
no
2021-05-26 00:23:11 +02:00
zeroisthebiggay
bdd7ae54d4 Update miscellaneous.dm 2021-05-24 23:10:07 -04:00
keronshb
9e3c1ff860 adds floor cluwnes from yog 2021-05-24 22:46:59 -04:00
zerothebigboy
fc3c898cd4 tab 2021-05-24 21:49:36 -04:00
zerothebigboy
36fe3fef76 abuse 2021-05-24 21:40:15 -04:00
Linzolle
1bb911441c fix brand intelligence runtime 2021-05-24 17:53:05 -05:00
keronshb
13b589507d Clown Spawner
For admin fun!
2021-05-24 15:13:41 -04:00
keronshb
d7ae90eb13 Digitigrade vers 2021-05-24 13:33:12 -04:00
keronshb
77d302f8f6 Ports Swag Outfit 2021-05-24 12:47:55 -04:00
DrPainis
7dab80cbb7 fuck 2021-05-23 23:42:16 -04:00
DrPainis
51911e1f27 adds the recipe for goliath calamari 2021-05-23 23:36:11 -04:00
DrPainis
a7add64905 adds a lazily made sprite for goliath calamari
I suck at spriting so this is the best I could do.
2021-05-23 23:29:25 -04:00
DrPainis
ce1b170b46 adds goliath calamari 2021-05-23 23:27:48 -04:00
keronshb
7458909970 Switched heated screws to solder. 2021-05-23 13:36:03 -04:00
silicons
eba3f554bc Merge pull request #14737 from zeroisthebiggay/KILL
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
2021-05-23 08:52:25 -06:00
keronshb
8787caccba Fixes the roundstart deconstruction issue 2021-05-22 14:12:31 -04:00
keronshb
bd05dd29b6 ReinforcedPlasmaSteps
Adds more steps for deconning stronger windows
2021-05-22 13:58:01 -04:00
zerothebigboy
25c99bb23c fuckihatecoding 2021-05-22 11:52:55 -04:00
zerothebigboy
07682b71b3 shoujo 2021-05-22 10:28:06 -04:00
zerothebigboy
37c3bc23a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair
# Conflicts:
2021-05-22 07:21:02 -04:00
silicons
92e019dd56 Merge pull request #14716 from Putnam3145/fix-blacklisting-traits
Makes species/antag trait blacklist no longer remove ALL traits
2021-05-22 03:41:57 -06:00
silicons
57584b11d2 Merge pull request #14743 from keronshb/contractor25
Lowers pop for Contractors down to 25.
2021-05-22 01:38:05 -06:00
silicons
e1a800ff49 Merge pull request #14742 from keronshb/specialhudport
(READY) Ports Special Hud icons for some simple mobs
2021-05-22 01:37:59 -06:00
silicons
acdb57b0d1 Merge pull request #14739 from WanderingFox95/WanderingFox95-Ears
A small ear related PR (Deer ears, Rabbit ears)
2021-05-22 01:37:05 -06:00
silicons
0dd24d9de9 Update world_topic.dm 2021-05-21 19:35:46 -07:00
silicons
f07d832cad Update world_topic.dm 2021-05-21 18:20:28 -07:00
zerothebigboy
af24fef322 inari 2021-05-21 20:46:48 -04:00
zerothebigboy
f54c893748 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair 2021-05-20 18:57:51 -04:00
Lin
67ea47998c Merge pull request #14738 from Putnam3145/fix-activity-again
Makes antags actually get activity properly
2021-05-20 13:33:51 -05:00
keronshb
99a94e2b3a Contractor poplock to 25
Title
2021-05-19 21:53:14 -04:00
keronshb
538efd2d8f Alt Click and Alt Click message 2021-05-19 20:01:11 -04:00
keronshb
88dc0821d1 User gibs when being turned into a spess dragon 2021-05-19 19:49:48 -04:00
keronshb
0f7c71cfdb trailing endline 2021-05-19 19:19:48 -04:00
keronshb
1d843cc72f Part 3 - the missing stuff 2021-05-19 19:19:35 -04:00
keronshb
b19fb1cfa8 Part 2 with Sprites 2021-05-19 19:18:50 -04:00
keronshb
a15637a929 Part 1 of Health Bars for Space Dragon 2021-05-19 19:18:19 -04:00
keronshb
b33269c806 trailing endline 2021-05-19 19:16:24 -04:00
keronshb
a6e157ba73 IT WORKS!! 2021-05-19 19:03:21 -04:00