Commit Graph

33013 Commits

Author SHA1 Message Date
Cerebulon
3aa19c4800 Fixes fixed path fix 2022-04-11 08:10:42 +01:00
Cerebulon
e8a804587d Adds Preference for Graffiti Engraving + Alt-click engraving option 2022-04-11 08:00:50 +01:00
Cerebulon
bbe7a038e2 More general bureaucracy sprites/additions 2022-04-11 07:25:37 +01:00
Cerebulon
691556e0d0 More Nicer Chairs 2022-04-11 06:23:55 +01:00
Cerebulon
1699953b17 description-sprite inconsistency 2022-04-11 04:58:40 +01:00
Cerebulon
68bc068df5 New holobadges, holsters, and sprites 2022-04-11 04:56:18 +01:00
Atermonera
1410a2ec7f Merge pull request #8519 from Rykka-Stormheart/shep-dev-turf-fixy
Fixes 6 year old bug with icon filepaths being override in update_icon
2022-04-10 14:21:05 -08:00
Atermonera
31d94c1f7d Merge pull request #8517 from Spookerton/spkrtn/sys/ssai-ssaifast
improved fire loop behavior of SSai & SSaifast
2022-04-10 14:15:24 -08: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
Atermonera
5e4961f986 Merge pull request #8510 from Spookerton/spkrtn/fix/bird-genders
human/get_visible_gender applies user perspective
2022-04-10 13:29:44 -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
11dcaf97b8 updated get_atom_on_turf
accounts for bad cases (non-movable subject, subject with a bad loc)
gently improves loop test performance
2022-04-09 11:21:51 +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
c2482da766 Merge pull request #8516 from Sypsoti/mmc-fix
Station's Message Monitor Functions Again
2022-04-09 10:50:46 +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
Sypsoti
b20117b306 adds late init 2022-04-08 16:26:21 -05: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
Greenjoe12345
3328240299 removes extra animation frame on teshari pike sprite, removes material colour from weapons 2022-04-07 20:30:30 +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
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
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
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
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
11f5ed7d2c Merge pull request #8507 from Atermonera/buckled_hud_color
Colors hud alerts according to their master object's color.
2022-04-03 11:17:22 +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
ef3486f932 Colors hud alerts according to their master object's color. 2022-04-02 19:41:20 -08:00
atermonera
fd30a1a6f6 Removes ERT Rangers items from loadout 2022-04-02 19:35:19 -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
Greenjoe12345
b27a278123 better arrow sprite, no material color for gladius 2022-04-03 04:08:11 +01: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
f8cd43fa69 Merge pull request #8495 from Spookerton/spkrtn/sys/out-with-the-old
remove pre-513 compatibility bits
2022-04-02 17:42:59 -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
d26bff099b Merge pull request #8485 from Spookerton/spkrtn/sys/atomic
isatom as istype /atom  -->  isloc && !isarea
2022-04-02 17:37:59 -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