Commit Graph

20904 Commits

Author SHA1 Message Date
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
Rykka
192d01ee5b Fixes 6 year old bug with icon filepaths being override in update_icon
Specific to mining turfs, but I imagine others might have this.
The reason we don't directly pull from 'icon' is to allow turf making folk to have some fun to play with it, make the icon change only on update, etc.

If preferred, icon_path var can just be set to grab the turf's base icon path, but I prefer the var imo.
2022-04-10 11:08:36 -06:00
spookerton
c82c18769f improved fire loop behavior of SSai & SSaifast 2022-04-09 11:31:39 +01:00
spookerton
5bea34d56a human/get_visible_gender applies user perspective
Changed the signature of atom/get_visible_gender to support human* mob use
human/get_visible_gender accepts a user and a force var
force can be used to force PLURAL, the examinee's id gender, or bio gender
human/get_visible_gender takes the examinee's clothing into account
human/get_visible_gender handles ambiguous_gender when there is a user:
- if also human*, same species gets id gender, otherwise plural
- if observer / silicon, id gender

fixes #7207
2022-04-09 11:22:06 +01: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
100e915cbd replace the crazy global vars decl, hide vchatdb
/database is a curse
but only here
2022-04-08 00:49:50 +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
da2046da8d Merge pull request #8482 from Spookerton/spkrtn/cng/legacy-text-number-handling
legacy text number handling
2022-04-06 16:46:09 -08:00
Spookerton
9a6fe9732a Merge pull request #8506 from Atermonera/ert_rangers
Removes ERT Rangers items from loadout
2022-04-05 19:46:01 +01:00
Spookerton
4662ddac57 Merge pull request #8494 from Verkister/patch-90
Fixes runtime with turrets and viscerators
2022-04-05 19:44:39 +01:00
Spookerton
72951d1929 Merge pull request #8463 from listerla/buzzhiss
Ports Vaurca autohiss from Aurora to Zaddat
2022-04-05 19:39:15 +01:00
atermonera
9a1aed60c6 undoes unintended nerfs, but keeps intended ones 2022-04-04 23:06:41 -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
spookerton
7eedbedba5 removes some legacy procs, adds some other procs
NUFC

removed add_lspace — unused
removed add_tspace — unused
removed invertHTML — unused
removed hsl2rgb — unimplemented

removed hex2num — replaced with define
removed num2hex — replaced with define
removed add_zero — replaced with pad_left
removed add_zero2 — replaced with pad_left
removes hex2rgb — replaced with behavior of rgb2num()
removes hex2rgb_r — replaced with behavior of rgb2num()
removes hex2rgb_g — replaced with behavior of rgb2num()
removes hex2rgb_b — replaced with behavior of rgb2num()
removes assorted inline list(rgb) > hex — replaced with behavior of rgb()
removes assorted inline rand > hex — replace with random_hex_text

added hex2num define
added num2hex define
added random_hex_text
added generate_padding
added pad_left
added pad_right
2022-04-03 14:19:45 +01:00
Spookerton
ccde0c6cda Merge pull request #8508 from Atermonera/there_can_be_only_none
Removes highlander
2022-04-03 11:16:57 +01:00
atermonera
4d1ae71ce9 Removes highlander 2022-04-02 20:05:56 -08:00
atermonera
fd30a1a6f6 Removes ERT Rangers items from loadout 2022-04-02 19:35:19 -08:00
atermonera
56a8fd834e C4 still explodes if the turf its placed upon changes 2022-04-02 19:13:04 -08:00
Atermonera
a42e6b3446 Merge pull request #8497 from Spookerton/spkrtn/sys/30-inch-racks-01
subsystem pass 1
2022-04-02 17:52:27 -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
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
a3b8f0fd5f Merge pull request #8481 from Spookerton/spkrtn/fix/8451
adds client helpers, fixes an oversight from 8451
2022-04-02 17:36:43 -08:00
Atermonera
b0cff25a29 Merge pull request #8476 from Spookerton/spkrtn/cng/default-fps-40
default client fps is 40 instead of match-server
2022-04-02 17:35:25 -08:00
Killian
e39f24b49e Allergen CE Conversion (#8431)
* WIP allergen conversion

* allergen CE conversion

* allergen CE conversion

inap now actually stops reactions properly

* add brute/burn allergen reactions

* recommended changes
2022-04-02 17:28:25 -08:00
Greenjoe12345
bb24579a29 weapons 2022-04-03 02:27:16 +01:00
Mechoid
4780b1efe5 Planetary Meteors (#8422)
* Begins work on Planetary meteors

* Work, clean meteor code.

* Continues work. Meteors now handle their own movement and launching.

* New meteor types, some added to waves. Large meteor type fully implemented.

* Fix and adjust for comments.
2022-04-02 17:25:27 -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
Spookerton
1a317b45cd Merge pull request #8429 from Rykka-Stormheart/shep-dev-breath-sounds
Breathing Sounds While in Space
2022-04-01 18:34:50 +01:00
Spookerton
201c3cb220 Merge pull request #8441 from Cerebulon/hairnets
Adds Hairnets
2022-04-01 18:32:33 +01:00
Spookerton
6651fd8bfd Merge pull request #8480 from Serithi/master
Gives mech autocannon projectiles their own entry with unique sprite and lighting
2022-04-01 18:31:36 +01:00
Spookerton
a8f3898901 Merge pull request #8419 from Sypsoti/changelingredux-1
New Changeling Menu
2022-04-01 18:26:26 +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
8c7324bd60 Merge pull request #8465 from listerla/whatificouldspell
Corrects spelling of a Zaddat shroud
2022-04-01 18:24:45 +01:00
Spookerton
921bf58cef Merge pull request #8477 from Cerebulon/holomaps
Fixes missing colouration of station holomap
2022-04-01 18:24:16 +01:00
spookerton
2754e8a2db improve tgui subsystem fire( 2022-03-31 20:27:07 +01:00
spookerton
2dda71ecf0 remove ATAN2 define 2022-03-31 19:23:29 +01:00
spookerton
b4c3fe9eeb remove TAN define 2022-03-31 19:22:42 +01:00
spookerton
7fd5fd66b8 removed CLAMP01 define 2022-03-31 19:22:07 +01:00
spookerton
602cc67d2b removed CLAMP define 2022-03-31 19:21:58 +01:00
Verkister
19b59f306b Fixes runtime with turrets and viscerators
Fixes viscerators runtiming their ally check when shot by something that's not a mob.
2022-03-31 20:29:43 +03:00
spookerton
9fa7760234 default client fps is 40 instead of match-server 2022-03-30 15:04:45 +01:00
spookerton
b61156cefe adds client helpers, fixes an oversight from 8451 2022-03-30 15:04:29 +01:00
spookerton
5212706f3d cleans up atom/movable/Destroy + adds walk(src, 0) 2022-03-30 15:04:11 +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
92c041be7f Revert "makes drills great again"
This reverts commit 8f2eb5da7b.
2022-03-29 15:53:40 -08:00
Serithi
069adff1a3 Gives mech autocannon projectiles their own entry with unique sprite and lighting, also makes it a bit louder. 2022-03-26 21:31:51 -07:00