Commit Graph

21444 Commits

Author SHA1 Message Date
farie82
38d854dcdd Merge branch 'master' into logging-improvements 2020-05-22 07:16:23 +02: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
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
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
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
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
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
PidgeyThePirate
c909a10f5c Headcrabs now check if they're alive before nomming adjacent dead simple mobs as well as zombifying dead humans. 2020-05-14 11:38:43 +09:30
Fox McCloud
89c8ef43a6 Merge pull request #13399 from blinkdog/scorpio-review-20200507
Grammar and typo fixes
2020-05-13 20:41:05 -04:00
Sgtdevel
ce9f1597f3 Update soft_caps.dm 2020-05-13 11:50:15 -04:00
Sgtdevel
dd7ea13bf6 Update soft_caps.dm 2020-05-13 11:07:33 -04:00
Mars
e2312b8be1 Removes gottagofast_meth 2020-05-13 16:03:25 +02:00
Aquilar
70be83c4e2 forgot medicine had it's own special proc for on_mob_life
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
2020-05-13 00:43:04 +08:00
TDSSS
0bbcfde892 tweak, comment 2020-05-11 12:29:07 +02:00
TDSSS
b9defe5a64 reduces log spam 2020-05-11 03:46:10 +02:00
Fox McCloud
b913a1301a Fixes MC perms spam (#13406) 2020-05-10 00:07:46 -04:00
Fox McCloud
9b314f357b Merge pull request #13380 from AffectedArc07/pr-reviewer-mc-tab
Adds MC VIEWING to the VIEWRUNTIMES permission
2020-05-09 23:22:08 -04:00
Fox McCloud
5e7433576e Merge pull request #13360 from SteelSlayer/missionary-staff-fix
Fixes the missionary staff being unable to charge properly
2020-05-09 02:25:59 -04:00
Patrick Meade
3066aeb65f Grammar and typo fixes 2020-05-08 02:30:29 -05:00
Fox McCloud
17a4864326 Merge pull request #13369 from MarsM0nd/vendor_refactor
Vendor refactor
2020-05-06 18:30:59 -04:00
Fox McCloud
1495b5b63a Fixes Chem Grenades (#13386) 2020-05-06 07:43:18 -06:00
SteelSlayer
a3aafa4ce4 this works 2020-05-06 02:03:15 -05:00
Fox McCloud
02c93c8b18 Merge pull request #13379 from AffectedArc07/travis-fix-just-shoot-me-please
Fixes part of Travis I forgot about
2020-05-05 18:54:55 -04:00
SteelSlayer
a60bfc0fcc better logic 2020-05-05 17:20:48 -05:00
AffectedArc07
a9d945e4c7 Adds MC VIEWING to the VIEWRUNTIMES permission 2020-05-05 10:32:04 +01:00
AffectedArc07
b65030fec5 I need to learn to read my todos 2020-05-05 10:13:01 +01:00
Fox McCloud
a0c50f55eb Merge pull request #12696 from SteelSlayer/slime-no-attack-slime-people
Makes simple slimes ignore slime people when searching for targets again
2020-05-05 04:37:47 -04:00
Fox McCloud
c20487a876 Merge pull request #13344 from Daylight2/door-stuff
Fixes #13243 - Makes wands no longer work in den
2020-05-05 04:05:26 -04:00
SteelSlayer
faeb575c14 forcemove 2020-05-03 20:54:59 -05:00
Mars
e9ae6f1bd0 Refactor slogan_list 2020-05-03 11:07:22 +02:00
SteelSlayer
e79ca9fcac crossbow cell fix 2020-05-02 22:18:30 -05:00
Fox McCloud
faecf7cbfa Patch rework (#13062)
* Patch Rework Part 1

* applicator

* fixes

* fixes

* temperature settings

* single application patches

* additional

* new line fix

* fox  is a derp sometimes
2020-05-02 20:07:43 -04:00
Aronai Sieyes
7ab32209e5 Smooth vehicles 2020-05-02 19:36:27 -04:00
Aronai Sieyes
fd6c406830 Adjust beepsky to slow his roll slightly 2020-05-02 19:14:49 -04:00
Aronai Sieyes
2e90659869 Add slower glide to flipping places with people 2020-05-02 19:14:29 -04:00