cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-30 20:13:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,604 Commits 2 Branches 1 Tag
3a14333c8f81663aa70fb28adcbac4059017ed47
Commit Graph

8090 Commits

Author SHA1 Message Date
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
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
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
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
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
atermonera
c7f1880394 Revert "What was supposed to be another straightforward major system overhaul that once again spiraled out of control (#8220)" 
This reverts commit 4d8c43f106.
 2022-03-29 16:01:32 -08:00
atermonera
20b60157eb Revert "A KNIFE!" 
This reverts commit 0dabd4a717.
 2022-03-29 15:54:14 -08:00
Rykka Stormheart
17e38ea58c Update code/game/objects/items/devices/defib.dm 
Co-authored-by: Spookerton <spkrtn@pm.me>
 2022-03-28 02:03:55 -06:00
Rykka
9bd77e462e Adds pain upon being revived with a defib 
As stated.
When brought back to life, you're given a moderate amount of pain to simulate the defib pain.
 2022-03-27 19:31:05 -06:00
Atermonera
614dbac882 Merge pull request #8479 from Mechoid/FixPuddleDefcon 
Fix a Defcon grade runtime with puddle creation and deletion
 2022-03-26 21:54:32 -08:00
Mechoid
2278a41211 :sadcatthumbsup: 2022-03-26 19:03:07 -07:00
Verkister
d0f2724559 Update human.dm 2022-03-25 18:48:10 +02:00
Verkister
44166771c9 Update cards.dm 2022-03-25 18:46:19 +02:00
Verkister
871391f6f6 Update AI_modules.dm 2022-03-25 18:45:18 +02:00
Verkister
f07059358a Update defib.dm 2022-03-25 18:44:18 +02:00
Verkister
efa92bc700 Update code/game/objects/structures/catwalk.dm 
Co-authored-by: Spookerton <spkrtn@pm.me>
 2022-03-25 17:47:01 +02:00
Verkister
5b1e592293 Fixes catwalks making footsteps on everything 
Fixes catwalks making footstep sounds on literally anything that crosses them, including ghosts and projectiles and everything else that definitely shouldn't be making footsteps.
 2022-03-24 21:10:14 +02:00
Cerebulon
1ff390003e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into hairnets 2022-03-22 01:39:59 +00:00
Atermonera
4280270e70 Merge pull request #8448 from Cerebulon/mugging 
Robs You In Public
 2022-03-20 11:28:24 -08:00
Cerebulon
cafac92ada Map Tweaks March 2022 + Locker Equipment (#8439) 
* Map and Locker Tweaks

* skybridge window tile switch

* additional changes
 2022-03-20 11:16:17 -08:00
Atermonera
8f5bd6cc5a Merge pull request #8438 from Cerebulon/magmellitename 
Changes Void Opals to Magmellite
 2022-03-20 11:13:42 -08:00
Cerebulon
e4d22f96cb Adds a bunch of mug variants 2022-03-18 18:05:24 +00:00