Commit Graph

1941 Commits

Author SHA1 Message Date
Atermonera
f6f00cc9e2 Merge pull request #8673 from Woodratt/antaguplinkmedical
Antag Uplink Medical Adjustments
2022-08-06 20:29:31 -08:00
Woodratt
fa8f4b07d6 Antag Uplink Medical Adjustments
Major reduction on the cost of all medical items. Reason being traitors tend not to buy medical items since they're so expensive but they also don't have access to the same kind of medical care as the crew.

Also added the basic medical kits to the uplink. Costs will be adjusted if need be in the future.
2022-08-04 14:27:13 -07:00
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
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
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
Atermonera
032c899201 Merge pull request #8636 from Greenjoe12345/clothingmay22
clothing port May 2022
2022-05-14 21:11:51 -08:00
Greenjoe12345
ba62bff4b3 clothing 2022-05-12 00:02:02 +01:00
Sypsoti
47bec39758 bartending enhancements 2022-05-09 22:09:22 -05: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
spookerton
1b13c8dd9f fix files with invalid utf-8 2022-04-27 01:02:04 +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
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
556331a6a3 use /global/ sugar for bare globals, no leading / 2022-04-24 07:54:34 +01:00
spookerton
2572f042a3 redo behavior of ssoverlays and atom overlay procs 2022-04-24 07:50:46 +01: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
Sypsoti
dcc661ffea Merge pull request #8552 from Doctress/BBMagazines
Adds BB Magazines
2022-04-17 22:02:11 -05:00
Doctress
b20f7baefa Changes as requested by Sypsoti 2022-04-18 11:19:02 +09:30
Sypsoti
f658968ec7 Merge pull request #8550 from Greenjoe12345/swordsandbow
Historic Weapons Expansion
2022-04-17 20:33:53 -05:00
Cerebulon
8e488776e8 Missing comma 2022-04-17 18:15:29 +01:00
Cerebulon
4d4167450c Added missed retro_red refs 2022-04-17 18:14:22 +01:00
Cerebulon
078c0b1fe1 Adds Some More Decorative Flooring Types 2022-04-17 17:57:06 +01:00
Doctress
52d6a0b73b Teaches Doctress basic-ass Git skills
Addresses errors noted in https://github.com/PolarisSS13/Polaris/pull/8545
2022-04-17 05:40:35 +09:30
Cerebulon
ea96d2dc05 Dress Shirt Undershirts 2022-04-14 20:12:35 +01:00
Greenjoe12345
2cc01d685a Merge branch 'master' of https://github.com/Greenjoe12345/Polaris into swordsandbow 2022-04-14 19:55:27 +01:00
Cerebulon
b414ac04ea Don't overwrite that when pasting actually 2022-04-11 10:14:02 +01:00
Cerebulon
599c2c8c57 Adds a bunch of new bags and replaces nearly all bag sprites 2022-04-11 10:07:58 +01:00
Spookerton
eafc8fabb6 Merge pull request #8504 from Atermonera/c420
C4 still explodes if the turf its placed upon changes
2022-04-09 11:02:59 +01:00
atermonera
4368e99055 fiddlybits 2022-04-04 23:02:21 -08:00
Greenjoe12345
a19ddfce0e Merge branch 'master' into swordsandbow 2022-04-03 21:00:59 +01:00
spookerton
7eedbedba5 removes some legacy procs, adds some other procs
NUFC

removed add_lspace — unused
removed add_tspace — unused
removed invertHTML — unused
removed hsl2rgb — unimplemented

removed hex2num — replaced with define
removed num2hex — replaced with define
removed add_zero — replaced with pad_left
removed add_zero2 — replaced with pad_left
removes hex2rgb — replaced with behavior of rgb2num()
removes hex2rgb_r — replaced with behavior of rgb2num()
removes hex2rgb_g — replaced with behavior of rgb2num()
removes hex2rgb_b — replaced with behavior of rgb2num()
removes assorted inline list(rgb) > hex — replaced with behavior of rgb()
removes assorted inline rand > hex — replace with random_hex_text

added hex2num define
added num2hex define
added random_hex_text
added generate_padding
added pad_left
added pad_right
2022-04-03 14:19:45 +01:00
atermonera
56a8fd834e C4 still explodes if the turf its placed upon changes 2022-04-02 19:13:04 -08:00
Atermonera
83ac485925 Merge pull request #8496 from Spookerton/spkrtn/sys/out-with-the-old-2
remove some obsolete defines
2022-04-02 17:46:13 -08:00
Atermonera
0921064401 Merge pull request #8492 from Spookerton/fenodyreeav/material-armor-crafting
adds material armor crafting recipes
2022-04-02 17:41:04 -08:00
Atermonera
3adb6b548a Merge pull request #8486 from Spookerton/spkrtn/fix/movable-destruction
cleans up atom/movable/Destroy + adds walk(src, 0)
2022-04-02 17:39:09 -08:00
Atermonera
a3b8f0fd5f Merge pull request #8481 from Spookerton/spkrtn/fix/8451
adds client helpers, fixes an oversight from 8451
2022-04-02 17:36:43 -08:00
Greenjoe12345
bb24579a29 weapons 2022-04-03 02:27:16 +01:00
Spookerton
a8f3898901 Merge pull request #8419 from Sypsoti/changelingredux-1
New Changeling Menu
2022-04-01 18:26:26 +01:00
Spookerton
f06dcc071e Merge pull request #8470 from Verkister/patch-89
Some admin log "usr" fixes
2022-04-01 18:25:29 +01:00
spookerton
2dda71ecf0 remove ATAN2 define 2022-03-31 19:23:29 +01:00
spookerton
602cc67d2b removed CLAMP define 2022-03-31 19:21:58 +01:00
spookerton
b61156cefe adds client helpers, fixes an oversight from 8451 2022-03-30 15:04:29 +01:00
spookerton
5212706f3d cleans up atom/movable/Destroy + adds walk(src, 0) 2022-03-30 15:04:11 +01:00