Commit Graph

20707 Commits

Author SHA1 Message Date
Ketrai
edb54f137d Cooking QOL V2 (#8644)
* cooking_qol

* fixes

* fixesconflictindiner
2022-06-05 16:16:50 -08:00
Cerebulon
86cb4c5f60 Fixes directional overlays on padded comfy and rounded chairs (#8622)
* Fixes directional overlays on comfy and rounded chairs

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

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

Co-authored-by: Spookerton <spkrtn@pm.me>
2022-05-23 20:28:44 -08:00
Atermonera
032c899201 Merge pull request #8636 from Greenjoe12345/clothingmay22
clothing port May 2022
2022-05-14 21:11:51 -08:00
Atermonera
a5a9d81445 Merge pull request #8634 from Sypsoti/hyperzinenerf
Nerfs Hyperzine
2022-05-14 11:01:14 -08:00
Atermonera
fab45d385f Merge pull request #8633 from Sypsoti/bartendinggood
Bartending enhancements
2022-05-14 10:55:50 -08:00
Atermonera
7f75c63be2 Merge pull request #8629 from KillianKirilenko/kk-minifix
Chest -> Torso Targeting Fixes
2022-05-14 10:53:14 -08:00
Atermonera
2f29ad7c44 Merge pull request #8627 from Spookerton/spkrtn/sys/db-things
db flex tape
2022-05-14 10:51:13 -08:00
Greenjoe12345
a8e150e8ab Fix mask adjusting 2022-05-12 00:26:26 +01:00
Greenjoe12345
1b9dfa42cb fix relatively pathed type 2022-05-12 00:18:13 +01:00
Greenjoe12345
ba62bff4b3 clothing 2022-05-12 00:02:02 +01:00
Sypsoti
50372663e6 hyperzine nerf and hallucinogenic psilocybin 2022-05-10 14:37:05 -05:00
Sypsoti
47bec39758 bartending enhancements 2022-05-09 22:09:22 -05:00
Sypsoti
b377425b9a Merge pull request #8625 from Atermonera/removes_dnaswitch
Removes dnaswitch artifact effect
2022-05-09 09:09:12 -05:00
Killian
805ec533c7 chest targeting fixes 2022-05-08 23:13:33 +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
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
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
aae5ab5965 Merge pull request #8599 from Atermonera/toner_sprites
Toner has a sprite again
2022-05-03 11:05:48 -05:00
atermonera
dc8dd779e1 Toner has a sprite again 2022-05-01 11:15:44 -08:00
atermonera
acbd424bae Fixes fruits missing their stems 2022-05-01 09:48:38 -08: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
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
039329a7b0 fixes runtimes 2022-04-25 13:27:59 -05:00
Atermonera
66c6dd7961 Merge pull request #8567 from Cerebulon/xenoarchapril
Replaces/Expands Upon Xenoarch Sprites
2022-04-24 21:44:54 -08:00
Atermonera
21bd8477c7 Merge pull request #8531 from Spookerton/spkrtn/sys/global-agenda
updates all bare globals to use /global/ semantics, and all shared members to /static/
2022-04-24 19:56:07 -08:00
Atermonera
2a494dcb66 Merge pull request #8530 from Spookerton/cerebulon/ssoverlay
alt of 8336
2022-04-24 18:57:19 -08:00
spookerton
beec187978 clean up odd list attribute order, add tests 2022-04-24 07:54:35 +01:00
spookerton
556331a6a3 use /global/ sugar for bare globals, no leading / 2022-04-24 07:54:34 +01:00
spookerton
ee67e174fb use static for shared member vars 2022-04-24 07:52:32 +01:00