Commit Graph

1226 Commits

Author SHA1 Message Date
Ling
5e59a9b985 Merge remote-tracking branch 'yogstation13/master' into preferences 2023-01-15 16:02:53 +02:00
Ling
df044da860 Backports several SSlighting improvements: overlay lighting (#17271)
* Backports SSlighting optimizations

* Overlay lighting, first version compiles

* Change conflicting defines

* Sparks and beams dont count towards lumcount

* Fix rendering

* Various fixes

* Fix errors

* Fix PDA light


1

* a

* Update game_options.txt

* Fix plasmaman helmet

* Fixes

* Glowy changes

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2023-01-13 22:42:23 +00:00
Ling
0c529d0e72 Convert pref: graphic settings 2023-01-12 23:28:24 +02:00
Ling
27145fe46d Convert pref: credits & glasses
1
2023-01-12 21:38:05 +02:00
Ling
238e6f3599 Convert pref: ghost stuff 2023-01-12 20:39:20 +02:00
Ling
366f441deb Convert pref: buttons locked 2023-01-12 20:02:09 +02:00
Ling
fbfecf5e73 Convert pref: ui style 2023-01-12 19:59:10 +02:00
Ling
d4af44be85 Adds "Scan Gas" for ghosts (#17306) 2023-01-07 00:18:01 +00:00
ynot01
e0fcd5667d adrift (#17242)
We're leaving together
But still it's farewell
And maybe we'll come back
To Earth, who can tell?
2023-01-03 19:59:13 -06:00
Jamie D
19901c98af Runtimes 31st December (#17251)
* Update login.dm

* More

* more

* Update code/modules/mob/dead/observer/observer.dm
2023-01-02 03:11:08 +00:00
Jamie D
ad7b7e7543 Revert (#17049) 2022-12-24 11:19:22 +00:00
Chubbygummibear
147ca4ef8a "I can smell you." A total rework to Transcendent Olfaction and a new Bloodsucker Olfaction that smells blood (#16647)
* might work, but need to do more scent descriptions

* very good progress

* big commit for madam

* unused sprite

* comment cleanup

* cleaning up descriptions

* more scent desc changes

* p

* 20 seconds

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-12-17 14:35:09 +00:00
Molti
4c62fc502f Someone updated screen alerts but these were probably pending PRs when they did it (#16972) 2022-12-06 21:12:32 -06:00
ynot01
c2bb7c3b90 [JAMIE] Cyborgs automatically get PDA messengers & AI has a tablet now (#16947)
* AI PDA AAHHHHH

* parity in job names

* del tablet on destroy

* Update ntpda_msg.dm

* Update ntpda_msg.dm
2022-12-06 11:38:44 -06:00
monster860
8de16779d6 Replays 2.0 (#16211)
* C++ demo

* linuxy shit

* Working linuxy shit

* demo writer is necessary I guess

* use the working one

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-11-21 23:11:17 +00:00
Molti
16d65f52b8 MANKIND IS DEAD. BLOOD IS FUEL. HELL IS FULL. IPC MARTIAL ART (#16073)
* MANKIND IS DEAD.
BLOOD IS FUEL.
HELL IS FULL.

* now for the boring update commits

* brings back "Martial" from the comment

* maybe fixes the error?

* should fix the error now

* It worky now?

* adding emp counter

* EMP proof fuckery

* Adding temporary empresistance is a headache

* EMP counter works now
Also gives short term immunity after either counter or getting hit

* All done, except for that one error in the linter

* i might have just been dumb

* Blood is fuel part is improved
Shotgun now causes blood splatters
Variable speed boosts

* adds a dash sound effect

* screen_alert.dmi fixes

* readds the icons
2022-11-13 11:30:23 +00:00
ChesterTheCheesy
4aa6c0b45d either destroys the entire game, or increases performance... maybe both (#16178) 2022-10-29 15:02:44 +01:00
Redmoogle
8fe552108f Adds Nanite & Wound scans to ghost; Adds Med/Chem/nanite/Wound Scan UI Elements (#15932)
* kill me

* Why do the geneva convention prevent us from having anything red and plus shaped.
2022-10-01 13:15:30 +01:00
SuperSlayer
ea5da41c19 [Ready][Bounty] Adds new racial martial arts (#14709)
* Update computer.dm

* Update meat.dm

* Update objects.dm

* Update computer.dm

* Update meat.dm

* Update objects.dm

* boowomp

* e

* s

* s

* 3

* rev

* Update antagonists.dm

* Update blob_overmind.dm

* Update radial.dm

* Delete info.dm

* Update overmind.dm

* Update overmind.dm

* Update powers.dm

* Update role_preferences.dm

* Update job.dm

* Update mind.dm

* Update dynamic_rulesets.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Update antag_panel.dm

* Update revolution.dm

* Update bureaucratic_error.dm

* Update _job.dm

* Update ai.dm

* Delete anti_union_propaganda.txt

* Update antagonists.dm

* Update blob_overmind.dm

* Update generic_negative_events.dm

* Update _blobstrain.dm

* Update _blob.dm

* Update _job.dm

* amonus

* del

* e

* e

* i hope ot will work

* Update antagonists.dm

* Update role_preferences.dm

* Update status_effects.dm

* Update traits.dm

* Update mind.dm

* Update objectives.dm

* Update objectives.dm

* Update traits.dm

* Update generic_positive_events.dm

* Update dynamic_rulesets_roundstart.dm

* Update hivemind.dm

* Create radar.dm

* fixes

* fix2

* fix3

* fix4

* tverb

* explosive fisting is 300$

* e

* e

* bebra

* aboba

* abobrus

* e

* amon sus

* help_verb

* bebra

* e

* vine snatch

* sususus amogus

* e

* wtf

* D

* help

* amongus

* granters

* fix

* Update garden_warfare.dm

* fixed some bugs

* vine throw now actually throws a vine

* Sex

* preternis gun

* Update garden_warfare.dm

* Update garden_warfare.dm

Co-authored-by: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com>
2022-10-01 12:37:24 +01:00
Redmoogle
a91ef5c4bf Datum lighting (#15931)
* Turns lighting objects into a datum, makes all lighting be performed with an underlay. big maptick fix very good! (#58991)

credit to zewaka for the idea of using underlays

turns the lighting object movables that were unnecessary and increased maptick into a datum which then applies and removes an underlay in update(). also applies a lot of general lighting clean ups (mostly using as anything in loops and fixing single letter var names).

multiz is a little different by necessity, now only the bottom turf's lighting matters in the brightness of the top turf unlike master where the bottom turf's lighting object is hidden from the vis_contents of the top turf. there are still some kinks to iron out here though, since currently objects suspended in openspace (like tram platforms) look bad and glass floors look bad too

only thing i have left to do is make multiz work (well)

UPDATE: multiz now appears the same as far as i can tell, its possible there are other situations in which its different but datum mats work and it automatically updates if the turf below changes. now i just need to make the system less finnicky if at all possible (and possibly merge managed_turf_vis_content with managed_overlays maybe?)

new update: its basically equivalent to normal multiz as far as i can tell (visually at least, in the circumstances ive tested so far)

NEW NEW UPDATE: turfs no longer have the VIS_HIDE vis_flag and multiz works without stacking the lighting from the floor below! so this shouldnt have any overt drawbacks to master anymore

1 needless movable per tile is terrible for maptick. this is probably a larger improvement than my emissive blocker change in terms of maptick. im guessing we'd get around 0.6 average maptick per player after this where currently we get 0.85 or so

Edit: according to lemon, sybil reached 0.71 maptick per person when tm'd with this

if this is a big enough improvement i might finally be able to get rid of the Gone discord avatar

* Revert "Turns lighting objects into a datum, makes all lighting be performed with an underlay. big maptick fix very good! (#58991)"

This reverts commit ffbbeb64f4.

* port from another codebase

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2022-09-30 19:54:14 +02:00
Redmoogle
0cc35fc453 Adds lungs(radiators) to IPCs (#15682)
* IPC Lungs?

* no co2 passout

* makes o2 and co2 work (I should refactor this shitcode)

* Update life.dm

* fix

* Update lungs.dm

* mmmm isnt this fun!

* Update screen_alert.dmi
2022-09-23 16:41:30 +02:00
GraveHat
c608a1a6e3 Megafauna (#15594)
Ethereal go boom
2022-09-10 20:35:13 +02:00
Mqiib
e4e0a7f96a mmstamina (#15504) 2022-09-04 13:58:50 +01:00
alexkar598
60db94977d Update action_button.dm (#15401) 2022-08-21 00:30:44 +00:00
Redmoogle
68fae77cc1 can I read? (#15396) 2022-08-20 15:49:43 +01:00
Redmoogle
fa869eb0da Observe Button Improvements (#15362)
* Observe Improvements

* Update action_button.dm

* Update action_button.dm

Still need to further test why certain icons dont show up right. (I think it has something to do with B.ordered)

* I DID IT AHAHAHAHAHA

* Improvements
2022-08-20 14:06:43 +01:00
Bop
9307063d6e [PORT] New stamina hud indicator (#15360)
* new stamina hud

* e

* noo

* bad idea
2022-08-20 14:05:15 +01:00
Redmoogle
1b95c64e85 Prevents you from resetting the position of buttons you dont own (#15299)
* No moving buttons you dont own

* Update action_button.dm
2022-08-20 13:31:53 +01:00
Redmoogle
ac540e2c42 [s] Unfucks fuckery with ghosts seeing buttons (#15353)
* unfuckery

* Update action_button.dm
2022-08-18 12:10:17 +01:00
Redmoogle
ac7ab44fbe Fixes a random runtime (#15281) 2022-08-14 18:46:43 +01:00
Redmoogle
78d68fed58 Allows ghosts to see buttons now (#15085)
* You can see buttons now!

* Makes action buttons reflect when removed/added and makes hide buttons toggle work for ghosts
2022-08-05 14:19:12 +01:00
nmajask
360370b599 Surgery tweaks 2 (#14737)
* stasis nerf

* aaa

* a

* a

* pain

* a

* wrapping up

* forgot to revert this

* pretty filter

* ctrl c ctrl v fails me again

* *scream

* spriting

* fex

* dont need this

* Surgical mat nerf

* pain
2022-07-24 12:18:30 +01:00
SuperSlayer
08f43f3fa3 Bloodsucker objectives rework (#14648)
* Update computer.dm

* Update meat.dm

* Update objects.dm

* Update computer.dm

* Update meat.dm

* Update objects.dm

* boowomp

* e

* s

* s

* 3

* rev

* Update antagonists.dm

* Update blob_overmind.dm

* Update radial.dm

* Delete info.dm

* Update overmind.dm

* Update overmind.dm

* Update powers.dm

* Update role_preferences.dm

* Update job.dm

* Update mind.dm

* Update dynamic_rulesets.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Update antag_panel.dm

* Update revolution.dm

* Update bureaucratic_error.dm

* Update _job.dm

* Update ai.dm

* Delete anti_union_propaganda.txt

* Update antagonists.dm

* Update blob_overmind.dm

* Update generic_negative_events.dm

* Update _blobstrain.dm

* Update _blob.dm

* Update _job.dm

* sus amogus

* Update blob_overmind.dm

* Update bloodsuckers.dm

* Update bloodsucker_objectives.dm

* Apply suggestions from code review

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-07-16 13:55:28 +01:00
Redmoogle
58de76c0b0 Gives ghosts a way to quickly unobserve someone (#14772)
* Gives ghosts a way to quickly unobserve, and gets rid of hide action button

* Update code/modules/mob/dead/observer/observer.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-07-16 10:59:04 +00:00
Theos
e554ae10d1 Update item_attack.dm (#14691) 2022-07-04 15:03:13 -05:00
Theos
f7595c277c fixes hitting things that delete themselves causing your attack cooldown to be set to some stupid high number (#14690) 2022-07-04 06:16:15 -04:00
nmajask
02847279d2 Surgical tweaks (#14589)
* a

* final touches

* makeshift tool surgery
2022-06-26 15:05:46 +01:00
SuperSlayer
90f81b04ba Ports "Swarmer HUD improvements" (#14500)
* Update computer.dm

* Update meat.dm

* Update objects.dm

* Update computer.dm

* Update meat.dm

* Update objects.dm

* swarmerhud
2022-06-26 13:21:52 +01:00
SuperSlayer
146c9fc58e Ports "Blobbernaut HUD improvements" (#14499)
* Update computer.dm

* Update meat.dm

* Update objects.dm

* Update computer.dm

* Update meat.dm

* Update objects.dm

* Blobberhud

* Ass
2022-06-26 13:19:46 +01:00
stwordcitizen
dd86d3f926 fixes health doll being on top of stop pulling button for simplemob (#14502)
* Update _defines.dm

* Update _defines.dm
2022-06-21 22:53:58 +01:00
ynot01
a94aa9a6f4 round actually ends on narsie & time defines (#14207)
* round actually ends on narsie

* time defines

* time defines
2022-05-28 22:56:57 +01:00
nmajask
dff69c9205 Refactors some embed stuff (#14183)
* Converts embedding into a proc

also adds a embed tic proc that is called whenever the embedde has a life tick

* a

* b
2022-05-21 22:45:46 -04:00
SuperSlayer
1686764c32 Ports some funni midround rulesets from TG (#13971)
* Sussy baka

* Update blob.dm

* Update blob.dm
2022-05-21 12:58:24 +01:00
SuperSlayer
b79669e669 Amogus Sussy Impostor???? (#14089) 2022-05-16 20:32:30 +01:00
tattax
7cc7105157 damage flags are now defined from tg (#14050)
* 1st

* s

* d

Co-authored-by: Theos <theubernyan@gmail.com>
2022-05-16 20:14:12 +01:00
SuperSlayer
8ea0512ad8 Ports "Generic living mob HUD" (#13955)
* E

* Update living.dm
2022-05-07 12:21:35 +01:00
TheGamerdk
1d49dfdbcb Update _defines.dm (#13894) 2022-04-25 23:30:00 +01:00
tattax
74147777a8 Ports Bloodsuckers and Monster Hunters from Fulpstation (#13273)
* bs and mh

above

* updoot

d

* fix 2

* updoot 3

* updoot 4

* updoot 5

* quick psosible fix

* updoot 6

* quick fix 2

* pr updoot (probably)

* updoot 7

* possible maybable fix

* second maybable possible fix

* should work for checks

* updoot 8

* attempt 2

* mindslave hud

* reupdates hud.dmi

* quickfix 1

* hotfix 2

* quickfix 3

* quickfix 5

* quickfix 4

* quick fix 6

* clean 1

* quickfix 7

* quickfix 8

* turns all clans flavor only

* code improvement + fixes

* things i forgot

* Revert yarn

* fix to huds

* quickfix 9

* quickfix 10

* quickfix 11

* quick fix 12 (the lugening)

* fuck

Co-authored-by: Theos <theubernyan@gmail.com>

* d

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>

* p

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>

* saves yogstation

* penis

* why can't we have nice things

* quickfix 13

* ssssssssss

* hell

* summon traps

* this probably is a good idea

* heolp

* merge master into poggy

* Revert "merge master into poggy"

This reverts commit c346759195.

* amogus

* possibly fixes the gamemode idk it compiles

* makes stuff not cringe

* i hate webeditor

* i hate webeditor

* i hate webeditor

* fixessss

* ducky

* 2

* o

Co-authored-by: adamsong <adamsong@users.noreply.github.com>

Co-authored-by: Byemoh <baiomurang@gmail.com>
Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
2022-04-10 12:28:02 +01:00
TheGamerdk
48d6a8daa6 Ports "Ports updates to the cameranet" (#13564)
* Ports updates to the cameranet (#6314)

Co-authored-by: ike709 <ike709@github.com>

* magic replace

* no kick

Co-authored-by: ike709 <ike709@users.noreply.github.com>
Co-authored-by: ike709 <ike709@github.com>
2022-04-09 05:06:16 -04:00
ynot01
31ddeb806d Autopsy surgery (#13500)
* Revert "update fork"

This reverts commit 67263d524d, reversing
changes made to e159e4b737.

* Revert "Revert "update fork""

This reverts commit e678f6f6da.

* Update borg_ai_skin_datums.dm

* autopsy

* Resolve merge conflict

* sewer slide logs & scanner req

* succeed without scanner & remove gloves req

* nerf non-scanner chance

* update comment for future generations

* map changes

Co-Authored-By: Maxim <23666142+maxion12345@users.noreply.github.com>

* Update YogStation.dmm

* Update YogStation.dmm

Co-authored-by: Maxim <23666142+maxion12345@users.noreply.github.com>
2022-04-02 23:49:26 +01:00