Commit Graph

28170 Commits

Author SHA1 Message Date
silicons
a7781f77fd Merge pull request #14802 from bunny232/atmosfoam
Atmos resin buff? fix?
2021-06-09 11:15:56 -07:00
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
fe8323f503 Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
Adds more deconstruction steps to stronger windows.
2021-06-09 11:13:13 -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
bunny232
7826ced174 Update effects_foam.dm 2021-06-06 12:54:07 -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
Lin
a31c99e361 Merge pull request #14786 from Arturlang/fixes_float
Fixes float()
2021-06-04 12:13:36 -05: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
Artur
f631879b88 fixes_float 2021-06-02 14:27:22 +03: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
42e382bb45 Merge pull request #14751 from keronshb/clownnades
Ports the Clown Mob Spawner from /tg/ for admins
2021-05-27 21:27:15 -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
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
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