Commit Graph

21474 Commits

Author SHA1 Message Date
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
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
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
Tourte-Yaya
dfd355023f Adds the bald IPC screen to ipc_face file 2020-05-21 20:12:06 +02:00
SteelSlayer
3085305eaa bloodcrawl trait 2020-05-20 14:55:50 -05:00
Fox McCloud
10a7b897a6 Lighting Performance Improvement (#13436) 2020-05-20 00:21:16 -06:00
AffectedArc07
da228ff995 BSA strikes are now logged to disk 2020-05-19 17:22:38 +01:00
SteelSlayer
e48d0785c7 Removes a bunch of unused vars 2020-05-19 03:23:05 -05:00
Aquilar
cb926d7074 thanks travis 2020-05-19 06:58:07 +08:00
Aquilar
5df41300fd some value changes
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
2020-05-19 06:44:08 +08:00
Aquilar
4d61487f9b This commit changes armour values of existing sec gear and adds armour values to some of the plasmamen helmets so they in line with everything else.
Lowers the protective values of the security beret to be line with the security cap, also removes bomb protection from both.
Lower the protective values for the security winter coat to be in line with the security security. (no more power gaming with custom load outs)
Adds armour values to the following plasmamen helmets so they not unnecessarily held back in those jobs; mining, hop, captain, security and blueshield.

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
2020-05-19 06:43:54 +08:00
datlo
6b7eb940fb Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-05-18 10:08:04 +02:00
Fox McCloud
adccc817e0 Merge pull request #13426 from MarsM0nd/meth_gottagoflag
Removes gottagofast_meth
2020-05-18 03:59:46 -04:00
Fox McCloud
27bd6a9ec4 Shock Proof Heart (#13395) 2020-05-18 01:39:59 -06:00
AffectedArc07
7ea6f190c5 Changelog Overhaul (#13051)
* Changelog Overhaul

* SQL Update

* This is why I hate merge conflicts

* Comment Correction

* Farie Fixes + Tested with blank DB

* Colours + Titles

* Colour tweaks

* I fell victim to my own CI Chains!

* Cleans up the remains of the old changelogs

* Fixes formatting

* Kyet Changes

* Date
2020-05-18 01:34:28 -06:00
datlo
9fcb19126e Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-05-18 09:22:27 +02:00
TDSSS
19d5c945bf Emagproofs CC, adds admin warning if ert shuttle is moved by non-ert (#12795)
* Increased security

* Increased security

* Fixes little oversight.

* Added admin warning

* Spelling
2020-05-17 18:47:18 -06:00
TDSSS
630251a0ff Makes some space ruins easier to find. (#12647)
* Added gps console to some space ruins

* adjusts gps naming/NEW

* Now actually works
2020-05-17 18:45:28 -06:00
AffectedArc07
af131aa92a Improves syndicate + DS radio 2020-05-17 10:52:22 +01:00
Fox McCloud
82eae73521 Merge pull request #13143 from NotDhu/loadout-tweaks
Makes classic secHUD available to Magistrate
2020-05-16 17:21:44 -04:00
AffectedArc07
693921e337 Hub is done - Now for relay UI and actions 2020-05-16 00:05:15 +01:00
AffectedArc07
d97a20aa3c Integrates NTTC + Other Stuff 2020-05-15 19:48:53 +01:00
Fox McCloud
d8134fd328 Refactor and Fixes EMP's (#13420) 2020-05-14 20:39:44 -04:00
Fox McCloud
bd6ed7fa86 GC Fixes (#13387)
* GC Fixes

* tweak

* fixes-gc-testing
2020-05-14 20:37:13 -04:00
AffectedArc07
64dc83846e Main part works. but we still got a long way to go 2020-05-14 22:46:26 +01:00
Deckard Cain
f97bc5876b fixed apples not distilling in fermenting barrels
apples previously distilled into hcider, which was an icon state and not actually a reagent proper. this resulted in apples simply not fermenting into anything when processed in a fermenting barrel. (if the apples contained reagents such as plant_matter or sugar or whatever else botanists put in their genes, then these would of course be transferred to the barrel normally.)
2020-05-14 16:53:41 -04:00
Fox McCloud
8faadf492b Merge pull request #13431 from PidgeyThePirate/Issue_13423_headcrab_animal_eating
Issue #13423 Fix - Headcrab death check
2020-05-14 09:34:22 -04:00
PidgeyThePirate
736f2132e3 You learn something new every day. 2020-05-14 12:59:38 +09:30
PidgeyThePirate
b08aeeb1ff Whoopsie. 2020-05-14 12:05:47 +09:30