Commit Graph

4994 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
listerla
899e769531 somethign -> something 2022-03-14 15:38:00 -04:00
Atermonera
7428ac95c3 Fixes material bats not returning init hints (#8393)
* Fixes material bats not returning init hints

* Can the cans pass CI

* Brace for letting
2022-02-13 20:55:33 -08:00
Cerebulon
4fad562e9e Cybernetic Augments and Sick Tats (#8200)
* Cybernetic Augments and Sick Tats

* Cybernetic Augments and Sick Tats

* Fixed indentation

* Unused var

* Excludes metal bits from cloning/dna copies.

* Genetics as var

* Add a line.

* what if a list was a list
2022-02-12 23:51:04 -08:00
Atermonera
78810736a9 Merge pull request #8379 from Atermonera/fix_chembag_slowdown
"""Halves""" chem bag slowdown
2022-02-06 14:21:23 -08:00
Atermonera
f603223d88 Adds antag subsystem to handle antag datum init (#8383)
* Adds antag subsystem to handle antag datum init. Moves antag datum defines to a module. Antagging new_players via traitor panel moves their created bodies to appropriate spawnpoints.

* Un-oopsies some unnecessary init order changes
2022-01-27 20:08:10 -08:00
atermonera
9122358136 """Halves""" chem bag slowdown 2022-01-22 16:35:42 -08:00
Atermonera
e9ddcc8bf5 Merge pull request #8372 from Atermonera/aknife
A KNIFE!
2022-01-22 15:39:49 -08:00
Atermonera
0dabd4a717 A KNIFE! 2022-01-18 17:29:50 -08:00
Cerebulon
c2f4d10b8b Mech and Locker Sounds 2022-01-17 13:22:33 +00:00
Atermonera
4d8c43f106 What was supposed to be another straightforward major system overhaul that once again spiraled out of control (#8220)
* get_tool_quality has numerical meaning

* Basic tools set tool quality

* Toolspeed is replaced by tool quality checks

* Addresses assorted results from live test

* Extra cleanup
2022-01-16 15:52:55 -08:00
Atermonera
0232be9531 Repaths obj/effect/effect, datum/effect/effect [MDB_IGNORE] (#8312)
* Repaths obj/effect/effect, datum/effect/effect

* linter fixes

* No new

Co-authored-by: Atermonera <forslandm@gmail.com>
2022-01-16 00:14:39 -08:00
Atermonera
439c9bf1f7 Merge pull request #8340 from MistakeNot4892/siffixes
Various tweaks on and around exploration.
2021-11-21 00:04:24 -08:00
MistakeNot4892
2f0a618d45 /atom New() => Initialize() [MDB IGNORE] (#8298)
* Find and replace argless atom New() to Initialize().

* Manual replacement of no-arg New() to Initialize().

* Manually replacing remaining New() overrides.

* Fixing linter issues with now-removed New() args.

* Tidying area init overrides.

* Porting Neb's atom subsystem.

* Trying to isolate init problems.

* Adjusting Init code post-test.

* Merging duplicate Initialize() procs.

* Merge resolution.
2021-11-14 00:09:14 -08:00
MistakeNot4892
a4054152f4 Closed umbrellas are smaller. 2021-10-13 20:08:53 +11:00
atermonera
09fdd739fe Unequipping mask slot won't disable internals when wearing airtight hats 2021-10-06 23:22:46 -08:00
Ghost Actual
12b1a29efe Donk-Soft! (#8305)
* Initial port

* Various fixes

* Doomguy Costume Addition

Halloween just around the corner, I wanted to add a costume that uses the new toy guns.

* Merge conflict, fixes
2021-10-04 22:14:46 -08:00
Atermonera
9c4eceae2b Removes suicide_act() 2021-09-19 11:43:34 -08:00
MistakeNot4892
0f574bd2a4 Merge pull request #8292 from Schnayy/bugfixes-9-11-21
Fixes stray bugs
2021-09-13 10:16:00 +10:00
Schnayy
4fbeb64ae5 round start multitool 2021-09-11 08:59:45 -05:00
Schnayy
030741d681 fixes stray bugs 2021-09-11 01:28:49 -05:00
MistakeNot4892
c5e295041b Merge pull request #8252 from lbnesquik/Kot-material-costs
Expands the material values of certain items.
2021-09-03 12:19:29 +10:00