Commit Graph

77 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
ed79946ade [MIRROR] some istype to macros (#9802)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-01-05 23:01:49 +01:00
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
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
CHOMPStation2
aab270c74f [MIRROR] remove static chat colour tags (#7635)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
2024-01-29 18:45:19 -05:00
BlackMajor
7d72ebeb73 Don't spam admins please 2023-02-25 14:54:19 +13: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
0cdd2da44c Adds hud_states to almost all weaponry, credit to Serdy
Reshuffles files to match Polaris
2022-04-10 09:04:18 -06:00
Nadyr
c70ed31f40 Merge pull request #3446 from CHOMPStation2/upstream-merge-11841
[MIRROR] Somatoray Modularity
2021-12-12 05:27:18 -05:00
Casey
9c7d030128 Somatoray Modularity 2021-12-10 04:33:32 +00:00
Casey
c0cc81fbae SD QOL update 2021-12-10 03:21:22 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Atermonera
101c9c33c5 QoL: Projectiles 2020-03-17 00:55:56 -04:00
Atermonera
aaf71ecbbf Merge pull request #6615 from Shadow-Quill/Ion-Fix
Fixes ion proj not EMPing when hitting walls
2020-01-15 23:10:55 -05:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Unknown
1e45296d31 Conflict Resolution 2019-03-27 10:58:53 -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
Mechoid
6e99a135e3 Ion Rifle returned to original radius. (#5326)
* Return ion rifles to their intended 3x3 rather than 5x5.

* Changelog
2018-06-04 16:13:45 -04:00
Anewbe
09effef4f9 More projectiles now ignite things 2018-03-11 15:47:48 -05:00
Anewbe
a93cb256ec Ports Vorestation's emp effects and ion projectiles (#4818) 2018-02-15 12:29:33 -08: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
MarinaGryphon
72318d46b6 Replaces most of the gender macros. (#4681)
* Fixes #4632.

* 1:27 am coding best coding

* fixes a warning

* Removes the last of the gender macros. Gender is dead.

* gender II: the travis-ing

* linebreaks are dead too.

* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06:00
Mechoid
d5404ae0eb Adds More Spiders. Touches cuff-code tangentially. 2017-11-21 12:59:06 -08:00
Neerti
5c8140ee0b Removes some world << output, fixes a few bugs. 2017-09-05 22:52:46 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Datraen
3d442044d1 Adds Gene Targetting mode to Floral Somatoray
While I was rooting around in hydroponics code, I saw that a list was being regenerated with UI interaction, so I threw the list into the plant controller.

No proper sprites for the Floral Somatoray's new mode yet, but it uses the gun sprite from mutate mode, and the projectile sprite from yield mode.
2017-05-03 13:33:58 +01:00
Neerti
ea6128f986 Adds Modifier System, Changes Some Ling Stuff
Adds a fairly simple system that allows adjusting various numbers like max health, incoming damage, outgoing melee damage, etc.  The nice part is that changing certain variables this way (like max health) is a lot safer than manually setting the max health var directly.
Changes a lot of short lines of code to point towards a variable's getter or setter helper instead of reading the var directly so the modifiers can work.
Endoarmor, delayed toxin sting, Enfeebling sting, and recursive adrenaline overdose now use the modifier system.
Enfeebling sting now only lasts two minutes, from five minutes, however it now also reduces the victim's melee damage by 25%/50%, and increases the damage they suffer by 10%/35%, for normal and recursive respectively.
Delayed Toxin Sting's effects are now felt all at once instead of over the course of a few minutes.
2017-04-18 21:23:59 -04:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Anewbe
6816af4485 More toys kikiki 2017-01-25 22:20:52 -06:00
Anewbe
5bfc0c851e Changes the way embedding works 2016-10-11 21:29:49 -05:00
Anewbe
e65b0851f3 Adds emp shotgun shells, not yet obtainable. 2016-09-25 23:52:30 -05:00
MagmaRam
22adc0411a Lasers, energy projectiles, and muzzle flashes now produce light.
It's a bit wonky due to lighting only updating once every half-second,
but it's very much functional, at least on my desktop.
2016-09-17 23:14:41 -05:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
115eb19d33 Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate 2016-02-06 14:30:51 +10:30
Zuhayr
408cb5d8d8 Adds a coverage check to xenoflora splattering, adjusts brainloss across
the board.
2016-01-31 11:49:14 +10:30
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
2015-12-13 10:15:29 +01:00
SkyMarshal
d10118e3d0 Fixes #11346
Fixes #8123

Removes adminbus ability to call down the Icarus... because it's pretty broken.
2015-12-12 12:03:15 -07:00
PsiOmegaDelta
8100f286a6 Corrects two ex_acts.
Decreases immovable rod severity to match other ex_acts in file.
Increases meteor gun ex_act severity.
2015-06-21 13:26:48 +02:00
Chinsky
94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors
Ports /tg/'s meteors.
2015-06-08 14:17:57 +03: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
PsiOmegaDelta
a07d20d657 Ports /tg/'s meteor implementation.
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
mwerezak
ea39f7f718 Cleanup can_fire(), projectile flag
Removes can_fire() and moves some of it's functionality into
get_next_projectile(), which was renamed to consume_next_projectile() to
indicate the possibility of side-effects.
Also renamed flag var to check_armour
2015-02-12 01:37:19 -05:00
SkyMarshal
c8d6214657 Fix indent thing for pointdefense 2015-02-08 04:03:19 -07:00