Commit Graph

32488 Commits

Author SHA1 Message Date
Sypsoti
2fae0d653d several improvements: WIP 2022-04-16 09:24:33 -08:00
Sypsoti
2774f7dd50 ecstasy to bliss and removes cocaine 2022-04-16 09:24:33 -08:00
Sypsoti
d2a2c3bd16 adjustments 2022-04-16 09:24:33 -08:00
Sypsoti
8e701b70e2 big pharma has given us cocaine and straws 2022-04-16 09:24:32 -08:00
Spookerton
5ac0385f81 Merge pull request #8524 from Cerebulon/graffitipref
Adds Preference for Graffiti Engraving
2022-04-16 11:45:00 +01:00
Spookerton
3a14333c8f Merge pull request #8536 from Cerebulon/lettucefeast
Lettuce Eat
2022-04-15 10:42:48 +01:00
Spookerton
a20e5ac0a9 Merge pull request #8537 from Cerebulon/stockpartsprites
New stock part sprites
2022-04-15 10:42:25 +01:00
Spookerton
f4b74e54f3 Merge pull request #8540 from Cerebulon/batmos
Bay Atmos Sprites
2022-04-15 10:42:03 +01:00
Cerebulon
ec51cd5c45 Update code/game/machinery/spaceheater.dm
Co-authored-by: Spookerton <spkrtn@pm.me>
2022-04-15 05:05:58 +01:00
Cerebulon
a55c842113 Update code/game/machinery/spaceheater.dm
Co-authored-by: Spookerton <spkrtn@pm.me>
2022-04-15 05:05:52 +01:00
Cerebulon
359b5c75b2 Bay Atmos Sprites 2022-04-14 23:13:54 +01:00
Cerebulon
aba6293f8f ahem 2022-04-14 22:14:39 +01:00
Cerebulon
190df5af95 New stock part sprites 2022-04-14 22:10:01 +01:00
Cerebulon
0c6a827fd2 Lettuce Cook 2022-04-14 21:37:14 +01:00
Cerebulon
ea96d2dc05 Dress Shirt Undershirts 2022-04-14 20:12:35 +01:00
Spookerton
d4409c4031 Merge pull request #8534 from Sypsoti/clawmachinefix
Claw Machine Fix
2022-04-14 19:58:06 +01:00
Cerebulon
a3b8d7fdb1 Removes alt-click option 2022-04-14 19:28:05 +01:00
Spookerton
a3c4d73be8 Merge pull request #8523 from Cerebulon/bureasprites
More general bureaucracy sprites/additions
2022-04-14 18:59:53 +01:00
Spookerton
019b0e89f8 Merge pull request #8520 from Cerebulon/cop_crap
New holobadges, holsters, and sprites
2022-04-14 18:59:18 +01:00
Spookerton
9d8e121202 Merge pull request #8522 from Cerebulon/chairs2022
More Nicer Chairs
2022-04-14 18:58:58 +01:00
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
Spookerton
d0c064a437 Merge pull request #8532 from Sypsoti/clothingtweaks-4-22
Clothing fixes + Pocky fix
2022-04-14 18:58:29 +01:00
Sypsoti
7acb34671f finally fixes claw machine 2022-04-14 11:57:33 -05:00
Cerebulon
181471235a Update code/modules/paperwork/stamps.dm
Co-authored-by: Spookerton <spkrtn@pm.me>
2022-04-14 08:21:11 +01:00
Sypsoti
57c617d3ad requested changes 2022-04-13 16:46:28 -05:00
Sypsoti
3bec19b7d1 restricts teshari from site manager 2022-04-13 15:12:20 -05:00
Sypsoti
6eb8210190 general sprite fixes + chocolate reagent 2022-04-13 15:00:08 -05:00
Cerebulon
e7aea483c8 Actually references the right sprites 2022-04-12 21:11:10 +01: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
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
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