Commit Graph

21508 Commits

Author SHA1 Message Date
AffectedArc07
809c09f969 Fixes karma shop 2020-06-06 12:16:01 +01:00
farie82
239ed08caf Merge branch 'master' into afk-subsystem-2 2020-06-06 07:01:34 +02:00
AffectedArc07
64f127526d Programmatic Profiler Access (#13524)
* Programmatic Profiler Access

* Why do I never proof-read until submitting
2020-06-05 21:50:58 -06:00
Patrick Meade
a2ecd79be7 Rework power outage event (#13117)
* Rework power outage event

* Added compile time flag for event fixing itself when it ends

* Review Cleanup 1

* Fixed up line ending conflicts

* Going whole hog with a side of bacon

* Whoops, forgot the sausage and Canadian Bacon

* Better messaging and makes APC Overload an offical non-random event

* Test merge feedback rework
2020-06-05 21:41:52 -06:00
Fox McCloud
27756b0e25 Merge pull request #13490 from farie82/flash-and-camera-flash
Gives flashes and cameras a light flash
2020-06-05 23:18:47 -04:00
Fox McCloud
55d3a318be Merge pull request #13469 from ZomgPonies/karma
Karma menu update
2020-06-05 23:07:48 -04:00
Fox McCloud
250346d888 Merge pull request #13532 from AffectedArc07/removes-what-shouldnt-exist
Removes something which shouldnt really exist here
2020-06-05 20:56:11 -04:00
Fox McCloud
fad1e90499 Merge pull request #13528 from AffectedArc07/station-renaming
Renames the old station Delta wing to Theta
2020-06-05 20:42:51 -04:00
Fox McCloud
2b85a73d3e Merge pull request #13519 from farie82/light_construct-fix
Make light_constructs use X_acts. Fixes a runtime
2020-06-05 20:01:31 -04:00
Fox McCloud
de40c33d2a Merge pull request #13543 from SteelSlayer/princess-health-hud-fix
Terror queens that evolve from princesses will now be able to see their medhud properly
2020-06-05 19:37:45 -04:00
Fox McCloud
cbd3a3f96c Merge pull request #13539 from farie82/tcomms-log-fix
Fix AI say logging and cult logging
2020-06-05 19:35:13 -04:00
Fox McCloud
77ffb3f102 Various Life Refactor Fixes (#13536)
* Disposal Movement Fix

* guardian fix

* SSD fix

* blob mobs

* wizard teleport fix
2020-06-05 16:38:45 -06:00
SteelSlayer
34996bf36e hud fix 2020-06-04 21:19:14 -05:00
joep van der velden
763ba97c37 Fix AI say logging and cult logging 2020-06-04 22:21:54 +02:00
AffectedArc07
8a71c695cc Patches a hole 2020-06-04 14:36:29 +01:00
Fox McCloud
70b46d8aea Life refactor (#13471)
* Life Refactor WIP

* part 2

* part 3

* runtime fix

* newlines

* tweaks

* perspective checks

* fixes

* remote view tweaks

* more fixes

* robot fixes

* better updating

* cleaned up icon procs

* less proc call overhead

* performance gains

* more optimization

* shorter lists, removal of unecesary code

* gene OOP and dna styling cleanup

* oops

* axe disabilities

* typeless loop

* various tweaks and fixes

* brain checks

* runtime fixes

* cryo vision fixes
2020-06-03 19:43:30 -06:00
joep van der velden
caf272ee75 Review fixes 2020-06-03 16:28:24 +02:00
Fox McCloud
5d824a9c62 Merge pull request #13513 from farie82/virus-event-fix
Fixes the virus outbreak event from not being able to generate "normal" viruses. Also the naming is fixed
2020-06-02 18:11:51 -04:00
AffectedArc07
6cf3cba557 Removes something which shouldnt really exist here 2020-06-02 21:38:43 +01:00
AffectedArc07
ba0897928f Renames the old station Delta wing to Theta 2020-06-02 12:40:24 +01:00
joep van der velden
ac49debfce Make light_constructs use X_acts 2020-05-31 20:48:01 +02:00
Fox McCloud
70ca3b0101 Helps Organs GC Better (#13506) 2020-05-30 15:04:44 -04:00
joep van der velden
f57c5422ba fixes the virus event 2020-05-29 21:52:45 +02:00
AffectedArc07
793f18c5e5 Fixes dupe processing 2020-05-28 15:16:53 +01:00
joep van der velden
960e9833e6 Better feedback to user 2020-05-28 10:08:41 +02:00
joep van der velden
b23f98f258 Merge and requested changes. 2020-05-28 10:03:53 +02:00
AffectedArc07
2d252f3b67 Annihilates the global iterator 2020-05-27 21:29:58 +01:00
rebel228
8155b00fce Library computer fix (#13486)
fixes library computer printing wrong manuals
fixes a bug with an empty interface button in "print manual" section
2020-05-25 23:42:11 -06:00
Fox McCloud
9d755e4b00 Merge pull request #13446 from AffectedArc07/tcomms-overhaul
Telecommunications Overhaul
2020-05-25 18:51:58 -04:00
joep van der velden
d065268efd Gives flashes and cameras a flash 2020-05-25 21:15:26 +02:00
Fox McCloud
dbd2d0fbda Merge pull request #13482 from AffectedArc07/ipc-screen-tweaks
IPCs can now change their monitors while lay down
2020-05-24 14:07:04 -04:00
Fox McCloud
40baacc405 TG Label Component Port (#13449)
* TG Label Component Port

* every time I swear
2020-05-24 13:55:05 -04:00
Fox McCloud
bf796cf8fc Ports Cybernetic Ears (#13438)
* Ports Cybernetic Ears

* gosh darn new lines
2020-05-24 13:54:54 -04:00
Fox McCloud
18f21c14c7 Fixes Having a Frigging Monitor Glued to Your Face (#13483) 2020-05-23 20:30:17 -04:00
AffectedArc07
e42b16c638 THIS. IS A WEBEDIT. 2020-05-23 19:14:30 +01:00
AffectedArc07
a943dc45c1 *sigh* 2020-05-23 18:58:40 +01:00
Regular-Joe-SF
826cefeca7 Adds new SecHUD designations and tweaks secHUD on examining (updated 22 May) (#12666)
* Add new criminal_status

* Add new criminal_status

* Update security.dm

Add new criminal_statuses to sec records console

* Fix beepsky not arresting executees

* Sechud now shows latest comment on examination

* Update human.dm

Add new criminal_status

* Update hud.dmi

Add new sechud icons, animated hudexecute

* Sechud now shows latest comment on examination

Simplified it according to farie's notes

* Sechud now shows latest comment on examination

Once more, thanks Henk!

* Sechud now shows latest comment on examination

Per Henk's review, another one bites the dust.

* Machinery threatcounts fixed

I just noticed that actually this doesn't affect beepsky, but turrets at portable_turret.dm. Well, now there they are.

* Turret threatcounts fixed

Now it should be proper: execute status now counts as threat to turrets.

* Update hud.dmi

New sechud statuses. Hourglass symbol for search status

* Update hud.dmi

DISREGARD: Test commit for affected on icondiffbot

* Update hud.dmi

New sechud statuses. Hourglass symbol for search status

* Revert "Update hud.dmi"

This reverts commit 8deaf40679.

* New sechud statuses. Zoomglass for search status (now).

* New sechud statuses

Make ghosts with all HUDs or sechud enabled able to use the examine function of sechud.

* Add new sec statuses

LF and conflicts resolved

* add new sec statuses

LF and conflicts resolved

* fix turret threatcounts

LF and conflicts resolved

* add new sec statuses

LF and conflicts resolved

* add new sec statuses, add sechud ghost examine

LF and conflicts resolved

* Add new sec statuses

LF and conflict resolving take2

* Add new sec stasuses

LF and conflict resolve take2, rid with empty lines

* Fixing Travis warning on list access at 355

* On built fail

trailing newlines accidentially forgotten, check, warning on list access, better but still not gone (got to git gut)

* Fixing usage of LAZYACCESS

Yeah - there was just un-necessary stuff there. Thanks to AA and Farie for help

* One last un-necessary thing off

* Move criminal status to defines.

Per Farie request: criminal statuses are now defines, every usage of them moved to utilize them. Minor: CC evilfax uses now 'demote' status in demote reply

* Beepsky prisoner threatcount: status quo

back to what it was since indeed, it becomes a nuisance if he tried to chase prisoners in jail

* Requests done

Removed useless check from secrecordComment, used isobserver at ghost omnihud

* re-add isobserver check

My bad, this check actually gives ghosts the View Comment Log from the HUD where they can't interact with the other buttons. I guess this is exactly why you comment code

* More sane expression on check at secrecordComment

As requested!

Co-authored-by: xXx-RegularJoe-xXx <53127823+xXx-RegularJoe-xXx@users.noreply.github.com>
2020-05-23 11:26:48 -06:00
AffectedArc07
5eafd48525 IPCs can now change their monitors while lay down 2020-05-23 14:04:06 +01:00
Fox McCloud
798cf7a8be Removes Fat Sprites (#13430)
* Removes Fat Sprites

* fat vs chubby

* edge case
2020-05-23 03:10:39 -06:00
Fox McCloud
707258f78c Merge pull request #13462 from SteelSlayer/bloodcrawl-mimery-traits
Replaces the bloodcrawl variable with a trait
2020-05-22 23:51:49 -04:00
Fox McCloud
ab29b1ad77 Merge pull request #12907 from Aquilar/armouroversights
Fixes some armour value oversights
2020-05-22 22:47:47 -04:00
Fox McCloud
0c13ea733b Merge pull request #13468 from Tourte-Yaya/bald-IPC-screen
Allows the IPC players to select the bald IPC monitor using the "Change Monitor" button
2020-05-22 22:35:20 -04:00
AffectedArc07
b59f41e22b I want this hotel to not exist 2020-05-22 21:35:43 +01:00
AffectedArc07
83dd0acf5b Bugfixes round 1 2020-05-22 21:27:03 +01:00
AffectedArc07
a10b0acb81 Merge branch 'master' into tcomms-overhaul 2020-05-22 18:51:44 +01:00
Fox McCloud
7ad36060f3 Newcrit Death Threshold Tweaks (#13374) 2020-05-22 01:38:56 -06:00
SteelSlayer
c2813a73e2 Removes the Freeze Mech verb, and bundles its functionality into the Freeze verb (#12827)
* Makes the Freeze Mech admin verb work properly

* freeze overhaul, axe Freeze Mech verb

* define freeze on the atom/movable level

* CRLF to LF

* rebase and touch ups

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-05-21 21:41:00 -06:00
Pidgey
43f664f4a7 Diona nymphs can eat veggies (#12423)
* Diona Nymphs can now consume vegetables. It takes 2 seconds to do so, and they gain nutrition based on how much plant matter and/or nutriment is present. This tends to be a slightly slower way to grow than eating weeds (unless specialized plants are provided for the purpose, like high potency pumpkins) but provides an option to nymphs that have nothing but earthsblood trays around.

* Changed the spacing a bit.

* Changing some minor things in line with provided code reviews.

* Hopefully this is an improvement.

* Requested minor changes

* Swapped type check with isnymph(). I didn't even know these defines existed.
2020-05-21 20:21:42 -06:00
moxian
dce6e5b4af Fix paperwork acquiring extra line breaks when you change register (#12652)
* Move paradise-specific customization of marked.js to separate file.

This makes marked.js easily updatable from upstream if need be.

* Fix extra paragraphs being inserted when doing paperwork
2020-05-21 20:12:18 -06:00
rebel228
0ef3a33fa4 Cyborg Hypospray QOL tweak (#13403)
* Borg Hypospray QOL fix

Cyborg Hypospray QOL fix

Cyborg's hypospay now replenished reagents in inactive modes once the active mode is full.

* code quality improvements

moved duplicate code into its own proc
return TRUE/FALSE instead of 1/0
replaced magic number with a define

* added a trailing newline

added

* small code improvement

robot is pased as a parameter
got rid of var/ part in parameters
2020-05-21 18:16:18 -06:00