Commit Graph

8257 Commits

Author SHA1 Message Date
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
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
9d8e121202 Merge pull request #8522 from Cerebulon/chairs2022
More Nicer Chairs
2022-04-14 18:58:58 +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
Cerebulon
691556e0d0 More Nicer Chairs 2022-04-11 06:23:55 +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
Spookerton
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
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
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
Greenjoe12345
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
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
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
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
atermonera
0fbbf49840 Revert ":sadcatthumbsup:"
This reverts commit 2278a41211.
2022-04-02 14:54:08 -08:00
Spookerton
201c3cb220 Merge pull request #8441 from Cerebulon/hairnets
Adds Hairnets
2022-04-01 18:32:33 +01:00
Spookerton
339b42a690 Merge pull request #8484 from Rykka-Stormheart/shep-dev-defib-pain
Adds pain upon being revived with a defib
2022-04-01 18:28:37 +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
24ec2b2c66 Merge pull request #8468 from Verkister/patch-88
Fixes catwalks making footsteps on everything
2022-04-01 18:25:02 +01:00
spookerton
602cc67d2b removed CLAMP define 2022-03-31 19:21:58 +01:00
spookerton
5e7a007e47 clean up emag resolve_attackby, .orig files 2022-03-30 15:43:28 +01:00
spookerton
5212706f3d cleans up atom/movable/Destroy + adds walk(src, 0) 2022-03-30 15:04:11 +01:00
spookerton
209caf444c adds material armor crafting recipes 2022-03-30 15:03:27 +01:00
atermonera
861154df4d Revert "Fixes assorted mining toolspeed uses"
This reverts commit bd236dbdcf.
2022-03-29 16:19:36 -08:00