Commit Graph

32335 Commits

Author SHA1 Message Date
Cerebulon
1ff390003e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into hairnets 2022-03-22 01:39:59 +00:00
Atermonera
6054da8b3d Merge pull request #8443 from Sypsoti/drillfix
Drill quality now affects mining speed
2022-03-20 11:35:21 -08:00
Atermonera
1227ec1870 Merge pull request #8453 from Spookerton/spkrtn/fix/drill-the-mud
drills/bombs don't runtime on resourceless turfs
2022-03-20 11:30:57 -08:00
Atermonera
93d391a75f Merge pull request #8452 from Spookerton/spkrtn/fix/zap
machines don't try to electrocute ghosts
2022-03-20 11:30:30 -08:00
Atermonera
5e4d625bfc Merge pull request #8451 from Verkister/patch-87
Fixes universal_understand keeping mobs illiterate
2022-03-20 11:30:07 -08:00
Spookerton
b140301654 skathari disappear with a flash when killed (#8449)
also adds a heavily processed effect from a korg koassilator for the actual teleport effect
2022-03-20 11:29:41 -08:00
Atermonera
4280270e70 Merge pull request #8448 from Cerebulon/mugging
Robs You In Public
2022-03-20 11:28:24 -08:00
Atermonera
250002c32d Merge pull request #8447 from listerla/smsprite
Ports new supermatter sprite from Baystation
2022-03-20 11:24:57 -08:00
Atermonera
00401d3d37 Merge pull request #8446 from listerla/airlocksound
Ports airlock break sound (try 2)
2022-03-20 11:24:31 -08:00
Atermonera
b7e67dcd14 Merge pull request #8444 from listerla/pridepins
Adds pride pins to loadout
2022-03-20 11:24:06 -08:00
Cerebulon
122b75d789 Adds more alien organ sprites (#8442)
* Adds more alien organ sprites

* include skrell file

* Update code/modules/organs/subtypes/tajaran.dm

Co-authored-by: Spookerton <spkrtn@pm.me>

Co-authored-by: Spookerton <spkrtn@pm.me>
2022-03-20 11:22:26 -08:00
Cerebulon
cafac92ada Map Tweaks March 2022 + Locker Equipment (#8439)
* Map and Locker Tweaks

* skybridge window tile switch

* additional changes
2022-03-20 11:16:17 -08:00
Atermonera
8f5bd6cc5a Merge pull request #8438 from Cerebulon/magmellitename
Changes Void Opals to Magmellite
2022-03-20 11:13:42 -08:00
listerla
6842ffa5db Skrell markings & hair angle consistency (#8437)
* Skrell markings & hair angle consistency

* Post-testing fixes

* Deletes accidentally included oldsprite
2022-03-20 11:12:12 -08:00
listerla
b13c31da3f Ports 4 Zaddat suits from Citadel (#8436)
* Ports Zaddat suits

From https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/2228

* Item name and spacing fixes
2022-03-20 11:11:01 -08:00
Atermonera
968f95c717 Merge pull request #8432 from listerla/typos
somethign -> something
2022-03-20 11:08:56 -08:00
Atermonera
f02a4be541 Merge pull request #8430 from Verkister/patch-86
Fixes holodeck landmarks not clearing themselves
2022-03-20 10:56:04 -08:00
Atermonera
5bf5ea59b2 Merge pull request #8428 from listerla/zaddatchirp
Makes the chirp emote available to Zaddat
2022-03-20 10:53:59 -08:00
Atermonera
83d666819d Merge pull request #8427 from KillianKirilenko/kk-minifix
Remove evening gloves temp. protection
2022-03-20 10:53:48 -08:00
Atermonera
ac675a053c Merge pull request #8426 from Mechoid/PrometheanHandClean
Prometheans now do not clean items through gloves.
2022-03-20 10:53:37 -08:00
Atermonera
c8e13df677 Merge pull request #8425 from Verkister/patch-85
fixes puke coating stealing nutriment reagent's id
2022-03-20 10:53:28 -08:00
Atermonera
82b3892651 Merge pull request #8424 from Mechoid/PrometheanTimeskipUpdate
Update Promethean jobs and age for timeskip.
2022-03-20 10:53:12 -08:00
Atermonera
e20d161af0 Merge pull request #8423 from Verkister/patch-84
Fixes buns having the power to break food inits
2022-03-20 10:52:56 -08:00
spookerton
8c5315ecfd drills/bombs don't runtime on resourceless turfs 2022-03-19 20:53:55 +00:00
spookerton
aded1aeeb5 machines don't try to electrocute ghosts 2022-03-19 19:56:02 +00:00
Verkister
fe9b0f40fa Fixes universal_understand keeping mobs illiterate
Fixes paper text contents being censored to simplemobs with universal_understand enabled.
2022-03-19 20:18:07 +02:00
Cerebulon
e4d22f96cb Adds a bunch of mug variants 2022-03-18 18:05:24 +00:00
listerla
2b1360db68 Ports new supermatter sprite from Baystation
From https://github.com/Baystation12/Baystation12/pull/30803
2022-03-18 10:40:53 -04:00
listerla
585ea6ed02 Adds airlock break sound
From https://github.com/Alanii/NewHestia/pull/213
2022-03-18 10:40:21 -04:00
listerla
1850ec171a Adds pride pins to loadout
From https://github.com/tgstation/tgstation/pull/65242/files
2022-03-18 09:30:01 -04:00
Sypsoti
8f2eb5da7b makes drills great again 2022-03-18 00:28:33 -05:00
Cerebulon
37d685d799 Moves area defines onto maps, fixes blob/vine spawns (#8421)
* Moves area defines onto maps, fixes blob/vine spawns

* Redundant region define
2022-03-17 18:16:11 -08:00
Cerebulon
75c7a03a7c Adds Hairnets 2022-03-17 18:48:43 +00:00
Cerebulon
3a5b038668 Changes Void Opals to Magmellite 2022-03-17 16:16:41 +00:00
listerla
899e769531 somethign -> something 2022-03-14 15:38:00 -04:00
Verkister
a76582cee8 Fixes holodeck landmarks not clearing themselves
Fixes holodeck spawn landmarks (such as carps and "atmos test") not getting cleared when the program is unloaded and thus permanently leaving the holodeck to spawn endless carps and sparks on every simulation without any way to fix ingame.
2022-03-13 17:10:24 +02:00
Atermonera
ff93a129ea Merge pull request #8418 from Spookerton/spkrtn/fix/resolve-dmmsuite-switch-warnings
resolves sdmm-suite switch warnings
2022-03-12 19:47:40 -08:00
Cerebulon
474a8c43cf Decl Music and Ported Music + Licenses (#8221)
* Decl music + ported music

* Bugfixes and not

* unit test

* debug shit + some fixes

* More Changes

* Removes some unused/extra songs in case it was a file size issue

* Nuke crash-prone songs

* Add cynosure defines

* It Just Works Now + Finished Headphone code/sprites

* requested tweaks/debug removal

* recheck dme
2022-03-12 19:45:36 -08:00
listerla
50cd02edae Makes the chirp emote available to Zaddat 2022-03-11 16:36:25 -05:00
Killian
2de9a10cbc remove evening gloves heat protection 2022-03-08 06:29:37 +00:00
Mechoid
4f67148a95 Detective 2022-03-07 12:07:26 -08:00
Mechoid
16cc4908a7 Prometheans now do not clean items through gloves. 2022-03-07 12:04:50 -08:00
Verkister
d56c7268df fixes puke coating stealing nutriment reagent's id
How do you even miss this and how in the world is the code itself able to miss it too until something messes up a bunch of buns?
2022-03-07 20:45:44 +02:00
Mechoid
1c6c60bac2 Update Promethean jobs and age for timeskip. 2022-03-07 09:07:45 -08:00
Verkister
1d396d2d08 Fixes buns having the power to break food inits
Fixes a bug that caused a bad index runtime on mapped-in buns during map init that somehow apparently makes all food cause nausea and vomiting or something.
2022-03-07 18:02:50 +02:00
spookerton
e5023f92aa resolved sdmm-suite switch warnings 2022-03-04 19:30:36 +00:00
Mechoid
222a68bcd7 Fix bugsons and an oversight. 2022-03-04 08:14:24 -08:00
Atermonera
8d6542547c Merge pull request #8407 from Mechoid/RealityPuddle
Fix the div 0 problem. God damnit.
2022-02-26 11:44:07 -08:00
Atermonera
0fb7f87a21 Merge pull request #8406 from Cerebulon/LunchOptions
More Boxed Lunch Options
2022-02-26 11:43:08 -08:00
Atermonera
bbd31dabac Merge pull request #8405 from Atermonera/pen_paper
Fixes paper missing write links
2022-02-26 11:42:14 -08:00