Commit Graph

73 Commits

Author SHA1 Message Date
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-04 15:00:17 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084)
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-09-30 21:36:41 +02:00
Kashargul
80e08697a7 another case of update_icon in NEW (#8500) 2024-06-09 15:20:15 +02:00
Cadyn
57a0b4a5eb minor fixes (#8209) 2024-04-11 07:47:16 +02:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750)
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-02-16 10:54:47 +01:00
CHOMPStation2
dc189c0b16 [MIRROR] Killian's Grab Bag PR (#6880)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-08-29 17:30:20 +02:00
Heroman3003
8826718f1c Gun Reloading Microtweaks 2023-05-27 03:30:22 +00:00
Seris02
2200cd9c10 almost made a big woops there weh 2023-02-26 12:38:24 +08:00
Seris02
246faa3c67 gun sprite chomp check 2023-02-26 10:21:42 +08:00
Rykka
26fbd5e3cb TGMC Final Commit - Fixes Ammo Count + symbols + Medigun/Curabitur
Changes:
- Code copied over to hud.dm and commented out, to prep for upstream pull.
- Commented-out, unused code removed.
- CHOMPEdits removed, pending upstream PR.
- Medigun no longer shows 2x the actual ammo loaded.
- Curabitur now fetches the amount of shots correctly, bar 1 extra for some reason.
- Curabitur ammo updates on automatic recharge ticks.
- A ton of projectile get_ammo_count optimization - mostly swaps the massive if/else for for loops. Fixes multiple guns not getting ammo properly, now casings won't register as ammo unless they have a shell in the casing.
- hud_state_empty defined as base on all bullets.
- Corrects energy weapons missing a hud_state_empty.
- Gives Ion weapons a hud_state_empty

All changes have been tested, and bar the Curabitur having an extra shot for ??? reason, which is a base bug I've yet to fix, this is entirely ready for testmerge.
2022-04-10 09:04:18 -06:00
Rykka
92ccb52ca7 Multiple Testing Fixes
- Fixes all projectile guns not having an empty state after unloading the gun via various methods
- Fixes stun revolver not having an empty sprite
- Fixes self-charging guns not updating ammo counts

Still needing fixes:
- Revolvers do not update ammo counts after firing, only on emptying the gun/adding new shells.
2022-04-10 09:04:18 -06:00
Rykka
85e69ffba4 Progress Commit 2 - Energy Gun HUD works, starting Projectiles
Saving progress to resume later.
2022-04-10 09:03:20 -06:00
Rykka
22c27abf06 Finishes Serdy's Gun PR stuff
Uzi uses new sprite + tilts now.
Sec pistols use new sprite
Energy Gun uses new sprite.
C20r uses new sprite.
L6 SAW uses new sprite.
Ion Rifle uses new sprite.
Z8 Bulldog uses new sprite.
WT-550 uses new sprite.

Resolves https://github.com/CHOMPStation2/CHOMPStation2/issues/3068

Serdy will add Stetchkin, PPK + PPK Light later.
2022-04-07 03:53:43 -06:00
Chompstation Bot
318ac12a29 ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs 2021-10-27 16:05:04 +00:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045
[MIRROR] Removes limits on eating, centralizes nutrition changing.
2020-04-29 19:23:55 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Atermonera
cd10c54d5c Merge pull request #6834 from Mechoid/RIGFixes
Fix various RIG issues
2020-03-17 01:06:31 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat
6b2c7cc29a Update energy.dm 2019-10-21 19:54:30 -04:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Novacat
7a518bc619 Merge branch 'master' into upstream-merge-5944 2019-03-28 19:19:44 -04:00
Novacat
04c5080426 Merge pull request #4755 from VOREStation/upstream-merge-5940
[MIRROR] Fix a div/0.
2019-03-28 17:39:34 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Mechoid
c8006a6e84 Event / Future PoI / Other weaponry & tools. 2019-03-27 02:34:28 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Atermonera
47bcf542fc I shouldn't do math at 2 AM 2019-02-10 00:10:00 -05:00
Anewbe
a32e90cca7 Merge pull request #5940 from Mechoid/Fix_DivZero
Fix a div/0.
2019-02-08 17:55:41 -05:00
Atermonera
fe94038e7a Recharger refactor 2018-06-16 17:15:59 -04:00
Leshana
32416bc2b6 Fix missing descriptions on guns.
examine() is supposed to return a value, these ones did not.
2018-04-25 22:16:28 -04:00
Anewbe
534a588a6a Gun changes (#4185)
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
2018-02-12 23:12:14 -08:00
Neerti
7497aef295 work 2017-11-26 12:08:05 -05:00
Anewbe
c9cbbd3a9b Swaps non-mounted recharging guns to batteries 2017-10-27 20:43:31 -05:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Leshana
4b46703d9d A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-14 01:07:35 -04:00
Anewbe
771d8b9e4b Adds a smaller device cell for use in non-weapon devices 2016-10-08 15:34:18 -05:00
Anewbe
9ff32b5914 Weapon Cell Oversight fixes 2016-10-07 21:48:21 -05:00
Anewbe
0f51fda83a Energy weapons can be reloaded 2016-10-06 21:30:52 -05:00
Yoshax
374b866053 Completes dna lockable guns implementation by adding a dna chip that can be added to guns 2016-08-31 15:24:22 +01:00
Zuhayr
ab9574ee06 Fixing some infinite loops in gun update_icon() calls. 2016-01-22 04:27:00 +10:30
Neerti
e0986cb7ab Ballistic weapons will now correctly say that the firing mode was changed. 2015-12-02 08:04:34 -05:00
HarpyEagle
ad54aca3ab Streamlines gun firemodes
Gun firemodes now work by setting vars on the parent gun item. Removes the
need to unpack a bunch of firemode values when shooting and the need for
certain guns to define special firemode types.
2015-08-10 14:38:08 -04:00
mwerezak
3906989eac Mostly removes creation of throwaway objects from chameleon items
- Replaces the creation of throwaway items from New() with initial() calls for all chameleon items.
- Unfortunately throwaway items could not be removed when switch appearance, as initial() does not work very will with list vars.
- Makes chameleon item name cache lists global.
- Makes chameleon guns a subtype of energy guns, removes chameleon magazines.
- Moves chameleon.dm to clothing module root
- Items without icon or icon_state are no longer selectable as chameleon appearances.
- Chameleon verbs go in their own panel.
2015-06-06 18:19:23 -04:00
PsiOmega
e74c0e65bf Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/power_cells.dm
2015-05-22 08:26:13 +02:00
mwerezak
defc4c1f94 Adds check_charge(), checked_use() 2015-05-18 20:09:09 -04:00
mwerezak
aeb1f5ae68 Updates instances of if(cell.use(...)) 2015-05-14 01:52:04 -04:00
mwerezak
f3dd96bb8c Adjusts charge costs for gun/energy
In particular, charge costs were chosen so that mounted energy guns
drain 80% of a default rig's power cell in 40 shots, and mounted laser
cannons drain the same in 20 shots.
2015-05-07 00:13:21 -04:00
mwerezak
3e1e137cec Adds device powercells
Adds a type of smaller power cell for powering devices. Not used by much
at the moment, but it's one step closer to a more coherent picture of
power cells.
2015-05-06 23:41:57 -04:00