Commit Graph

8147 Commits

Author SHA1 Message Date
Mechoid
e072e147a4 Archery Tweaks (#8670)
* Add proper custom arrows. (cross)Bows "render" proper arrows over themselves in inventory and on ground. Hardlight bow no longer deletes other arrows on removal.

* Fix subtyping issue.
Add Chitin arrow type.

* Remember to hit save, kids.

* Fixfix. Add true Unga arrow utilizing the Ancient Art of Sharp Rocks.
2022-07-31 22:09:53 -08:00
Greenjoe12345
de1377c1da deco stuff (#8667)
* deco

* Thalar not credits

* adjustments

* indent

* The linter does not like Latin Small Letter O With Diaeresis

* hopefully it will work now
2022-07-24 19:16:14 -08:00
MistakeNot4892
43883793e9 get_random_colour() now prepends a #. 2022-06-23 10:23:57 +10:00
Atermonera
68a1694b92 Merge pull request #8653 from MistakeNot4892/hermits
Added survivalist job, wilderness spawn and checkpoint spawn to Cynosure.
2022-06-16 18:57:02 -08:00
Atermonera
ce9cea6d67 Merge pull request #8652 from DemonPizza/Caneblade
Concealed Cane Sword
2022-06-15 17:00:28 -08:00
Atermonera
1d8141bda3 Merge pull request #8645 from Verkister/patch-91
Fixes recursive explosions
2022-06-15 16:43:12 -08:00
MistakeNot4892
8b8e1ecdf4 Added survivalist job, wilderness spawn and checkpoint spawn to Cynosure. 2022-06-15 21:44:02 +10:00
DemonPizza
b9b7e4e3cf - changes /obj/item/cane/concealed to contain a cane sword instead of a switch blade, as well as adds a subtype of katana for the cane sword
- changes cost of concealed blade in uplink to match the katana and other swords
- adds sprites for the item in game as well as shown on character
2022-06-13 16:24:08 -07:00
Ketrai
edb54f137d Cooking QOL V2 (#8644)
* cooking_qol

* fixes

* fixesconflictindiner
2022-06-05 16:16:50 -08:00
Verkister
a62389b6f2 Fixes recursive explosions
Recursive explosions finally updated to support brand spanking new features such as multi-z, and no longer uses global variables that limit the game into processing only one explosion at a time.
2022-05-31 19:02:25 +03: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
7f75c63be2 Merge pull request #8629 from KillianKirilenko/kk-minifix
Chest -> Torso Targeting Fixes
2022-05-14 10:53:14 -08:00
Greenjoe12345
3165f0d5a9 rucksack in explo locker, dust mask in jani and engi lockers 2022-05-12 22:36:00 +01:00
Greenjoe12345
ba62bff4b3 clothing 2022-05-12 00:02:02 +01:00
Killian
805ec533c7 chest targeting fixes 2022-05-08 23:13:33 +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
Cerebulon
b0b77ed84e Adds job winter coats to job lockers 2022-05-03 20:21:29 +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
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
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
c6dfdeaae2 remove unused sources in code/* 2022-04-26 21:17:59 +01: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
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
spookerton
1f3ffc2433 non-flagged, non-complex overlay -> ssoverlays 2022-04-24 07:51:12 +01:00
spookerton
2572f042a3 redo behavior of ssoverlays and atom overlay procs 2022-04-24 07:50:46 +01:00
spookerton
1ccb2df2de trivial 1:1 overlays -> overlay proc changes
NB. In some cases we go from a more complex image() to a single icon_state string and I assume this works for every case but do not care to check because of the sheer scale of extra fiddly effort. Buyer beware, not my code.
2022-04-24 07:50:21 +01:00
Cerebulon
355395ffbf Fixes ALL random tech components having a chance of being anomalous 2022-04-23 21:04:11 +01:00
Atermonera
a17ed4ec65 Merge pull request #8562 from Sypsoti/ponchofix_v2
Poncho Custom Item compatibility
2022-04-19 22:07:23 -08:00
Sypsoti
66ea17763e copies code and fixes small bug introduced 2022-04-20 00:36:51 -05:00
Sypsoti
f7cc15b098 Merge pull request #8556 from Cerebulon/arcadecarpets
Adds Some More Decorative Flooring Types
2022-04-19 11:12:31 -05:00
atermonera
fec412daaa Rebase issues 2022-04-17 19:18:15 -08:00
atermonera
9d71839ac6 Removes devices 2022-04-17 19:14:43 -08:00
atermonera
7a9806d9b4 Removes weapons 2022-04-17 19:14:32 -08:00
atermonera
101740a7d3 Updates icon paths 2022-04-17 19:14:07 -08:00
Sypsoti
f658968ec7 Merge pull request #8550 from Greenjoe12345/swordsandbow
Historic Weapons Expansion
2022-04-17 20:33:53 -05:00
Greenjoe12345
e4e27269a4 remove kopesh and dao 2022-04-18 02:11:38 +01:00
Cerebulon
078c0b1fe1 Adds Some More Decorative Flooring Types 2022-04-17 17:57:06 +01:00
Cerebulon
5f22d34b42 Reviews all POIs for loot/balance + adds random universal anomalies [MDB_IGNORE] (#8464)
* Reviews all PRs for loot/balance + adds random universal anomalies

* Include new file

* tgm formats for a couple of deconverted maps
2022-04-16 09:43:02 -08:00
Sypsoti
4b9f68814e sprite alignment and minor code cleanup 2022-04-16 09:24:33 -08:00
Sypsoti
8e92d375c4 AI code but cooler 2022-04-16 09:24:33 -08:00
Sypsoti
2774f7dd50 ecstasy to bliss and removes cocaine 2022-04-16 09:24:33 -08:00
Sypsoti
d2a2c3bd16 adjustments 2022-04-16 09:24:33 -08:00
Sypsoti
8e701b70e2 big pharma has given us cocaine and straws 2022-04-16 09:24:32 -08:00