Commit Graph

5032 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Greenjoe12345
2cc01d685a Merge branch 'master' of https://github.com/Greenjoe12345/Polaris into swordsandbow 2022-04-14 19:55:27 +01:00
Greenjoe12345
3bdc40cdf6 fixing issues 2022-04-14 19:22:14 +01:00
Spookerton
c262c05050 Merge pull request #8525 from Cerebulon/BagsOfFun
Replaces basically every bag and briefcase sprite, some new bag types.
2022-04-14 18:58:46 +01:00
Sypsoti
57c617d3ad requested changes 2022-04-13 16:46:28 -05:00
Sypsoti
6eb8210190 general sprite fixes + chocolate reagent 2022-04-13 15:00:08 -05: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
Atermonera
92d21dcc8c Merge pull request #8513 from Rykka-Stormheart/shep-dev-TGMC-ammo-HUD
TGMC Ammo HUD Port
2022-04-10 14:09:38 -08: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
Greenjoe12345
3328240299 removes extra animation frame on teshari pike sprite, removes material colour from weapons 2022-04-07 20:30:30 +01:00
Rykka
3fd5296682 TGMC Ammo HUD Port
Ports over TGMC's Ammo HUD and all relevant code, adapted to work for Polaris's guns. This took me several days, but hey, I learned a bunch. <:
Time to port Aim Mode + Mentorhelp. :3c 
- All guns now have an ammo HUD sprite. If one lacks one, it will be ??? or blank, at which point, make an issue report, as all guns should be working by now.
- Guns will display how many rounds they have left until ammunition runs dry.
- Ammo will only count the casings that CURRENTLY have a projectile in them. This is slightly unrealistic, yes, but it is better and more intuitive for the player. This also enables guns like the revolver to work, given they recycle casings.
- Up to 4 ammo HUDs can be displayed at once, but given we lack TGMC's attachments and guncode, you'll only ever usually see 2. TBD on porting over TGMC guncode. <:
- Ammunition for multiple guns has different colors in the HUD based on what you currently have loaded.
- If you're looking at this later on to add new things. DON'T USE _FLASH IN THE HUD_STATE_EMPTY. THE _FLASH IS ADDED ON BY CODE.
- Grenades have a hud_state, pending us ever porting over a grenade launcher. Rockets ALSO have a hud_state.


Example of Laser/Energy Weapons:
https://i.imgur.com/MGvqGxh.mp4
Captain's Gun:
https://i.imgur.com/Wd0SS3C.gif

Full Test of all weapons:
https://streamable.com/usp4dy

Upstream port of https://github.com/CHOMPStation2/CHOMPStation2/pull/4033
2022-04-07 01:00:23 -06:00
Atermonera
f63d33eafd Update code/game/objects/items/weapons/explosives.dm
Co-authored-by: Spookerton <spkrtn@pm.me>
2022-04-06 16:35:22 -08:00
atermonera
4368e99055 fiddlybits 2022-04-04 23:02:21 -08:00
Greenjoe12345
1cf1e48416 some balance and mechanic adjustments 2022-04-04 02:37:16 +01:00
Greenjoe12345
a19ddfce0e Merge branch 'master' into swordsandbow 2022-04-03 21:00:59 +01:00
atermonera
56a8fd834e C4 still explodes if the turf its placed upon changes 2022-04-02 19:13:04 -08:00
Greenjoe12345
b27a278123 better arrow sprite, no material color for gladius 2022-04-03 04:08:11 +01: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
8e617b3056 Merge pull request #8493 from Spookerton/spkrtn/cng/misc2022mar30-1
clean up emag resolve_attackby, .orig files
2022-04-02 17:41:31 -08:00