silicons
|
2402c56bfc
|
Merge pull request #14805 from bunny232/hydroslimejelly
Hydroponics slimejelly recipe from tg
|
2021-06-09 11:15:36 -07:00 |
|
silicons
|
c0e3b8d5ef
|
Merge pull request #14809 from SandPoot/speak-nice-yes
Centralizes borg speech and uses some of the icons for the typing indicator
|
2021-06-09 11:15:01 -07:00 |
|
silicons
|
259aed7903
|
Merge pull request #14783 from DeltaFire15/spec-species-color
Colors species names depending on traits
|
2021-06-09 11:14:48 -07:00 |
|
silicons
|
7963dce24e
|
Merge pull request #14712 from keronshb/hereticadjustments
Minor Heretic rework and fixes (Includes shifting realities and more)
|
2021-06-09 11:12:23 -07:00 |
|
silicons
|
716c2a04e4
|
Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
|
2021-06-09 11:10:17 -07:00 |
|
SandPoot
|
b0940456f5
|
upload files
|
2021-06-08 13:13:22 -03:00 |
|
bunny232
|
1a72070f5c
|
slimejelly
a
|
2021-06-07 21:44:33 -04:00 |
|
Lin
|
27d7b4b564
|
Merge pull request #14793 from bunny232/pool-fog
Pools now get misty at warm insteaed of scalding
|
2021-06-05 16:26:21 -05:00 |
|
Lin
|
5f6cb40d16
|
Merge pull request #14773 from Putnam3145/fix-activity-typo
Fixes an activity display issue
|
2021-06-04 21:37:42 -05:00 |
|
Putnam3145
|
b757e22956
|
Merge pull request #14763 from zeroisthebiggay/dogears
adds floppy dog ears that aren't obscenely dark
|
2021-06-04 15:37:57 -07:00 |
|
bunny232
|
720966f31e
|
Misty~
|
2021-06-03 19:10:46 -04:00 |
|
Lin
|
c2c2825027
|
Merge pull request #14772 from Putnam3145/fix-sniper-bad
Makes sniper zooming work
|
2021-06-02 21:50:33 -05:00 |
|
DeltaFire
|
b2e2c49011
|
plasmamen & golems
|
2021-06-02 17:47:57 +02:00 |
|
DeltaFire
|
0f01a4a7da
|
huh
|
2021-06-01 22:52:39 +02:00 |
|
DeltaFire
|
dd33371a3b
|
colors
|
2021-06-01 22:48:57 +02:00 |
|
silicons
|
cb52be5dd9
|
fixes linter warnings (#14778)
* woo
* woo
|
2021-05-31 10:19:20 -05:00 |
|
Putnam
|
0dc1163a29
|
adds a sorely needed line break
|
2021-05-30 00:44:02 -07:00 |
|
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 |
|
Lin
|
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 |
|
Lin
|
9aeb71c296
|
Merge pull request #14761 from silicons/getflaticon
Fixes camera image taking
|
2021-05-28 12:37:09 -05:00 |
|
silicons
|
caa2dbeefd
|
Update slaughter.dm
|
2021-05-28 05:51:21 -07:00 |
|
silicons
|
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 |
|
silicons
|
e686270b4d
|
Merge pull request #14755 from Linzolle/brand
fix brand intelligence runtime
|
2021-05-27 21:26:59 -06:00 |
|
silicons
|
e1efdb7937
|
Merge pull request #14750 from keronshb/swagoutfitport
Ports Swag outfit from /tg/
|
2021-05-27 21:26:52 -06:00 |
|
zerothebigboy
|
7dea33f6c2
|
doge
|
2021-05-27 16:08:28 -04:00 |
|
silicons
|
3c42247870
|
fix
|
2021-05-26 20:19:47 -07: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
a6e157ba73
|
IT WORKS!!
|
2021-05-19 19:03:21 -04:00 |
|
Lin
|
acb2177a85
|
Merge pull request #14732 from Citadel-Station-13/silicons-patch-32
adds _contents() wrapper for SELECT SDQL2 statements
|
2021-05-19 14:50:18 -05:00 |
|