Commit Graph
8417 Commits
Author SHA1 Message Date
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
AtermoneraandGitHub 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
SypsotiandGitHub 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
SypsotiandGitHub 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
CerebulonandGitHub 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
Sypsotiandatermonera 4b9f68814e sprite alignment and minor code cleanup 2022-04-16 09:24:33 -08:00
Sypsotiandatermonera 8e92d375c4 AI code but cooler 2022-04-16 09:24:33 -08:00
Sypsotiandatermonera 2774f7dd50 ecstasy to bliss and removes cocaine 2022-04-16 09:24:33 -08:00
Sypsotiandatermonera d2a2c3bd16 adjustments 2022-04-16 09:24:33 -08:00
Sypsotiandatermonera 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
SpookertonandGitHub 9d8e121202 Merge pull request #8522 from Cerebulon/chairs2022
More Nicer Chairs
2022-04-14 18:58:58 +01:00
SpookertonandGitHub 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
Cerebulon 691556e0d0 More Nicer Chairs 2022-04-11 06:23:55 +01:00
AtermoneraandGitHub 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
SpookertonandGitHub 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
SpookertonandGitHub 269c4a84b5 Merge pull request #8505 from Atermonera/squished_spiderling
Spiderlings die if they have 0 health
2022-04-09 10:50:25 +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
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 ce72d7a544 git commit -m "Spiderlings can grow up to be big and strong" 2022-04-04 23:03:54 -08:00
atermonera 859f35ba02 typo 2022-04-04 23:03:54 -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
Greenjoe12345andGitHub a19ddfce0e Merge branch 'master' into swordsandbow 2022-04-03 21:00:59 +01:00
atermonera 4a2e2cfae3 Spiderlings die if they have 0 health 2022-04-02 19:24:14 -08: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
AtermoneraandGitHub 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
AtermoneraandGitHub 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
AtermoneraandGitHub 0921064401 Merge pull request #8492 from Spookerton/fenodyreeav/material-armor-crafting
adds material armor crafting recipes
2022-04-02 17:41:04 -08:00
AtermoneraandGitHub 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
Greenjoe12345 bb24579a29 weapons 2022-04-03 02:27:16 +01:00
atermonera 35dbabff5d Revert "Reagent Geysers, Pump Fixing, Puddles. (#8268)"
This reverts commit 6996e46ed4.
2022-04-02 15:01:17 -08:00
atermonera c01ddc44b9 Revert "Fix bugsons and an oversight."
This reverts commit 222a68bcd7.
2022-04-02 14:54:08 -08:00