Commit Graph

33095 Commits

Author SHA1 Message Date
Sypsoti
b377425b9a Merge pull request #8625 from Atermonera/removes_dnaswitch
Removes dnaswitch artifact effect
2022-05-09 09:09:12 -05:00
Sypsoti
8d7da2ebd4 Merge pull request #8624 from Spookerton/spkrtn/fix/the-cold-pool
fix reactor pool heating up cooling pipes
2022-05-09 09:05:40 -05:00
Killian
805ec533c7 chest targeting fixes 2022-05-08 23:13:33 +01:00
spookerton
c0f8a74a23 remove db config globals partial defaults 2022-05-08 13:38:07 +01:00
spookerton
4954f3d576 add SSmisc_slow & db state / reconnect polling 2022-05-08 13:36:52 +01:00
spookerton
e1a52055e6 add config gates to establish_*_connection
these do happen further on as well but it's pointless to go through the
extra steps if we have no intention of using a database anyway, and
these procs are called in a bunch of places blindly.
2022-05-08 11:19:07 +01:00
spookerton
f631638862 remove unused forum sql configuration & globals 2022-05-08 11:17:48 +01:00
Spookerton
f35c60e440 Merge pull request #8623 from Sypsoti/nutmegseedstorage
Adds Nutmeg to Seed Storage
2022-05-08 10:09:25 +01:00
atermonera
306daa4707 I SUPPOSE I can make it compile before bed 2022-05-07 23:37:27 -08:00
atermonera
93c071dd7c Adds singularity artifact effect 2022-05-07 23:33:14 -08:00
atermonera
e791e8764b Removes dnaswitch artifact effect 2022-05-07 13:57:19 -08:00
Sypsoti
e69a92bcb7 Merge pull request #8618 from Spookerton/cerebulon/swimwear
pool swimwear locker names, holo floor/item names
2022-05-07 14:32:08 -05:00
spookerton
a23fde3f62 fix reactor pool heating up cooling pipes 2022-05-07 20:18:17 +01:00
Sypsoti
7375da29f2 adds nutmeg and purges purge 2022-05-07 14:13:05 -05:00
Spookerton
16f35bdfad Merge pull request #8607 from Sypsoti/loadoutcontraband
Expands Loadout Contraband
2022-05-07 10:27:49 +01:00
spookerton
217ebbcc4b pool swimwear locker names, holo floor/item names 2022-05-06 20:09:27 +01:00
spookerton
afe8554c50 repath /tape to /cassette_tape & map/list updates 2022-05-06 19:38:45 +01:00
Spookerton
41310d9ee9 Merge pull request #8606 from Cerebulon/winterlockers
Adds job winter coats to job lockers
2022-05-06 18:51:30 +01:00
Atermonera
e0e497187d Merge pull request #8588 from Doctress/sjorgenshotgun
Adds Sjorgen Inertial Shotgun (by H-H)
2022-05-05 17:54:50 -08:00
Sypsoti
f102073dcb adds nondrug contraband to loadout 2022-05-03 16:27:36 -05:00
Cerebulon
b0b77ed84e Adds job winter coats to job lockers 2022-05-03 20:21:29 +01:00
Sypsoti
6c674321f2 Merge pull request #8600 from Atermonera/readds_abilities
Readds ability overlays
2022-05-03 11:08:33 -05:00
Sypsoti
830376f29d Merge pull request #8598 from Atermonera/zone_sel_overlays
Fixes zone_sel always having torso overlay
2022-05-03 11:07:20 -05:00
Sypsoti
aae5ab5965 Merge pull request #8599 from Atermonera/toner_sprites
Toner has a sprite again
2022-05-03 11:05:48 -05:00
atermonera
146d556eb9 Readds ability overlays 2022-05-01 11:25:37 -08:00
atermonera
dc8dd779e1 Toner has a sprite again 2022-05-01 11:15:44 -08:00
atermonera
a3d68f6daa Fixes zone_sel always having torso overlay 2022-05-01 11:08:51 -08:00
atermonera
acbd424bae Fixes fruits missing their stems 2022-05-01 09:48:38 -08:00
atermonera
18c044e119 SSOverlays cuts queue from start to count, not count to end 2022-05-01 00:02:51 -08:00
Atermonera
58284cca9f Merge pull request #8590 from Spookerton/spkrtn/fix/lingering-overlay-odds
fix overlay odds
2022-04-30 15:30:46 -08:00
atermonera
690bb5d6cd Fixes AI subsystems being NOFIRE 2022-04-30 13:44:06 -08:00
spookerton
56f3758f1d fix overlay
using a shared renderer image was breaking things that used their own
images, if they set properties on those images - this resolves that by
removing the shared renderer and instead using a fresh image when a
cache entry is created, or by simply using the raw appearance of
uncacheable things like atoms and images without passing them through
another image for no real reason anyway.
2022-04-30 08:54:01 +01:00
spookerton
a0813040f5 rewrite gun cabinet overlay building
not a fix, just preferable to build a list first
2022-04-30 08:50:01 +01:00
spookerton
28dba8aba8 fix hydroponics trays
editing the file re-saved it as utf8, direct change is L15
2022-04-30 07:39:26 +01:00
Killian
1862b54013 Atmospheric Retention Fields Port (#8582)
* atmospheric retention fields

* arf updates

* Update atm_ret_field.dm

* Update circuits.dm

thought I got this one but oops

* Update polaris.dme

totally didn't forget to uncheck testmap

* Update atm_ret_field.dm

* fix a runtime, add examplemap demo area
2022-04-29 16:28:20 -08:00
Sypsoti
661b83e61d Drug Expansion (#8575)
* adds drugs and means to make them

* nutmeg sprite and hallucination changes

* adjustments + sounds courtesy of serithi

* nit nack paddy wack
2022-04-29 16:24:16 -08:00
Doctress
0cbbca8e6a Adds Sjorgen Inertial Shotgun (by H-H)
Semi-automatic, 5 round, tube magazine fed
Lootable, or buyable from both cargo and tator uplinks.
Balancing intended to lie between combat shotgun and not!AA-12
100 TC each (between combat shotgun and fuel rod cannon)
100 Req Points for a box of two (same price as a burst laser pair)
2022-04-30 05:51:01 +09:30
Atermonera
60c189933a Merge pull request #8583 from Spookerton/spkrtn/sys/workspace-settings-improvement
workspace improvements
2022-04-28 22:11:09 -08:00
Atermonera
063fcf5a81 Merge pull request #8581 from Cerebulon/befure
Befure
2022-04-26 22:50:59 -08:00
Atermonera
a72aa86402 Merge pull request #8580 from Cerebulon/deathgasp
Fixes doubled name when deathgasping
2022-04-26 22:50:35 -08:00
Atermonera
0226b7ec6a Merge pull request #8579 from Sypsoti/changelingmenucostfix
Changeling Menu Now Shows Cost
2022-04-26 22:49:52 -08:00
Atermonera
517e0ce981 Merge pull request #8577 from Sypsoti/vehicleruntimes
Vehicle Runtime Fix
2022-04-26 22:49:32 -08:00
Cerebulon
e37f6a7b9f Adjusts frequency of anomalies and weights effect rarity (#8572)
* Adjusts frequency of anomalies and weights effect rarity

* Nested if
2022-04-26 22:48:35 -08:00
spookerton
1b13c8dd9f fix files with invalid utf-8 2022-04-27 01:02:04 +01:00
spookerton
c6dfdeaae2 remove unused sources in code/* 2022-04-26 21:17:59 +01:00
spookerton
78db65f13f move some readme files in .dm sources into .md 2022-04-26 21:17:23 +01:00
Cerebulon
da63550263 Befure 2022-04-25 22:13:15 +01:00
Cerebulon
4d981ec635 Fixes doubled name when deathgasping 2022-04-25 21:02:15 +01:00
Sypsoti
66e71b6148 oops 2022-04-25 14:11:37 -05:00
Sypsoti
db81985a13 adds cost to evolution menu 2022-04-25 14:07:17 -05:00