Putnam
|
9040c08698
|
whoops i forgot the var
|
2021-05-30 00:38:07 -07:00 |
|
Putnam
|
2ab05d1247
|
makes sniper zooming work
|
2021-05-30 00:31:20 -07:00 |
|
 LinandGitHub
|
ef7a611baa
|
Merge pull request #14769 from Citadel-Station-13/silicons-patch-34
tweaks slaughter demon slam check
|
2021-05-29 17:36:54 -05:00 |
|
keronshb
|
25fe97e8fe
|
Lets Disposal pipes work on the cargo shuttle again
Silly removal.
|
2021-05-29 13:21:23 -04:00 |
|
zerothebigboy
|
8b9763a6a1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
|
2021-05-28 15:42:58 -04:00 |
|
 LinandGitHub
|
9aeb71c296
|
Merge pull request #14761 from silicons/getflaticon
Fixes camera image taking
|
2021-05-28 12:37:09 -05:00 |
|
 siliconsandGitHub
|
caa2dbeefd
|
Update slaughter.dm
|
2021-05-28 05:51:21 -07:00 |
|
 siliconsandGitHub
|
7c1b8ee07d
|
Merge pull request #14757 from Kraseo/no-bloodcrawlies
fixes being able to slam into people while bloodcrawled as slaughter demon
|
2021-05-28 06:50:19 -06:00 |
|
 siliconsandGitHub
|
e686270b4d
|
Merge pull request #14755 from Linzolle/brand
fix brand intelligence runtime
|
2021-05-27 21:26:59 -06:00 |
|
 siliconsandGitHub
|
e1efdb7937
|
Merge pull request #14750 from keronshb/swagoutfitport
Ports Swag outfit from /tg/
|
2021-05-27 21:26:52 -06:00 |
|
Linzolle
|
ed86a6628a
|
THIS SHOULD REALLY BE THE OTHER WAY AROUND
|
2021-05-27 19:53:55 -05:00 |
|
Linzolle
|
46833abf0b
|
add cult_permitted area flag
|
2021-05-27 19:34:00 -05:00 |
|
zerothebigboy
|
7dea33f6c2
|
doge
|
2021-05-27 16:08:28 -04:00 |
|
keronshb
|
e0a1e50927
|
Fixes the linter
|
2021-05-27 13:25:27 -04:00 |
|
keronshb
|
482b679937
|
Should fix the linter?
|
2021-05-27 12:24:16 -04:00 |
|
 DrPainisandGitHub
|
d42fb1ae90
|
makes cat meteors significantly rarer than meaty ores
|
2021-05-27 12:17:41 -04:00 |
|
keronshb
|
8f1db2d5ec
|
Fixes some stuff
Actually ticks the spell, fixes the brain damage issue, etc.
|
2021-05-27 12:16:54 -04:00 |
|
 DrPainisandGitHub
|
1ce8ffba11
|
fixes the typepath for cat meteors
|
2021-05-27 11:48:09 -04:00 |
|
 DrPainisandGitHub
|
1b8ef53014
|
maybe makes this compile
|
2021-05-27 00:55:41 -04:00 |
|
 DrPainisandGitHub
|
cbb7673e79
|
Adds the actual event.
Yes, cat meteors have the same announcement as carp.
|
2021-05-27 00:30:29 -04:00 |
|
 DrPainisandGitHub
|
98d5499712
|
adds the cat wave_type
|
2021-05-27 00:25:55 -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 |
|
 ArturlangandGitHub
|
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 |
|
 KraseoandGitHub
|
c3bfbac89a
|
this time for real
|
2021-05-26 01:43:45 +02:00 |
|
 KraseoandGitHub
|
7173bfade5
|
this is why i don't do webedits
|
2021-05-26 00:35:49 +02:00 |
|
 KraseoandGitHub
|
3b5f391843
|
Merge branch 'master' into no-bloodcrawlies
|
2021-05-26 00:29:20 +02:00 |
|
 KraseoandGitHub
|
7e2e608784
|
fixes slamming people into walls and such while bloodcrawled
no
|
2021-05-26 00:23:11 +02:00 |
|
 zeroisthebiggayandGitHub
|
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
|
d7ae90eb13
|
Digitigrade vers
|
2021-05-24 13:33:12 -04:00 |
|
keronshb
|
77d302f8f6
|
Ports Swag Outfit
|
2021-05-24 12:47:55 -04:00 |
|
 DrPainisandGitHub
|
7dab80cbb7
|
fuck
|
2021-05-23 23:42:16 -04:00 |
|
 DrPainisandGitHub
|
51911e1f27
|
adds the recipe for goliath calamari
|
2021-05-23 23:36:11 -04:00 |
|
 DrPainisandGitHub
|
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 |
|
 DrPainisandGitHub
|
ce1b170b46
|
adds goliath calamari
|
2021-05-23 23:27:48 -04:00 |
|
zerothebigboy
|
bd186d25cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
|
2021-05-23 15:29:20 -04:00 |
|
 siliconsandGitHub
|
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 |
|
zerothebigboy
|
25c99bb23c
|
fuckihatecoding
|
2021-05-22 11:52:55 -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 |
|
 siliconsandGitHub
|
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 |
|
 siliconsandGitHub
|
57584b11d2
|
Merge pull request #14743 from keronshb/contractor25
Lowers pop for Contractors down to 25.
|
2021-05-22 01:38:05 -06:00 |
|
 siliconsandGitHub
|
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 |
|
 siliconsandGitHub
|
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 |
|
zerothebigboy
|
af24fef322
|
inari
|
2021-05-21 20:46:48 -04:00 |
|