Commit Graph

28420 Commits

Author SHA1 Message Date
Lin 5f6cb40d16 Merge pull request #14773 from Putnam3145/fix-activity-typo
Fixes an activity display issue
2021-06-04 21:37:42 -05:00
MrJWhit 2db540aae3 Update holodeck.dm 2021-06-04 20:53:34 -04: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
silicons 829944640e Update _flags.dm 2021-06-04 09:24:15 -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
WanderingFox95 015bd3c338 Armor for security armor and a small fix 2021-06-02 17:22:46 +02:00
WanderingFox95 5c827d9796 Bit of that 2021-06-02 15:28:46 +02:00
Artur f631879b88 fixes_float 2021-06-02 14:27:22 +03:00
silicons 0d206742fa Update world_topic.dm 2021-06-01 21:35:49 -07:00
DeltaFire 0f01a4a7da huh 2021-06-01 22:52:39 +02:00
DeltaFire dd33371a3b colors 2021-06-01 22:48:57 +02:00
silicons 656d0545cd Update world_topic.dm 2021-06-01 01:32:54 -07:00
keronshb 70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
Arturlang 84db564e0f Prettier? code 2021-06-01 02:25:06 +03:00
Arturlang 4b541d3dac phonecode 2021-06-01 02:21:33 +03:00
silicons cb52be5dd9 fixes linter warnings (#14778)
* woo

* woo
2021-05-31 10:19:20 -05:00
Artur 8687312935 Makes orbit menu show antags if DNR 2021-05-31 18:14:06 +03:00
WanderingFox95 e69729beb4 So he doesn't need sodium thiopental after all.
Turns out Furranium has a knockdown.
2021-05-31 12:15:16 +02:00
WanderingFox95 249d23a6cc Fixed something with the event 2021-05-31 09:52:31 +02:00
WanderingFox95 2516afbbba Cat Surgeon Event
If I did it right, thanks Keron!
2021-05-31 00:41:59 +02:00
WanderingFox95 ae2970f318 Adds a special Catranq Dart 2021-05-30 21:17:03 +02:00
WanderingFox95 df0e1057d1 Imagine this crazy person became a threat suddenly 2021-05-30 21:15:44 +02: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
keronshb 25fe97e8fe Lets Disposal pipes work on the cargo shuttle again
Silly removal.
2021-05-29 13:21:23 -04:00
silicons 71db9298a1 Update world_topic.dm 2021-05-28 18:21:46 -07:00
keronshb c1a9f9cfe9 GLOW ANIMATION 2021-05-28 17:40:43 -04:00
keronshb 86a825bb9f Space Adapt outline 2021-05-28 15:57:16 -04: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 b1b931a7c4 Update _bodyparts.dm 2021-05-27 22:48:24 -07: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
Linzolle ed86a6628a THIS SHOULD REALLY BE THE OTHER WAY AROUND 2021-05-27 19:53:55 -05:00
Linzolle 0cf7c5070d parentheses 2021-05-27 19:45:12 -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
DrPainis 2eeb6ede1e lowers cat meteor threat and makes them use the cat meteor sprite 2021-05-27 12:20:54 -04:00
DrPainis 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
DrPainis 1ce8ffba11 fixes the typepath for cat meteors 2021-05-27 11:48:09 -04:00