Commit Graph

37523 Commits

Author SHA1 Message Date
AffectedArc07
da29f4ede1 Apply suggestions from code review
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-05-25 16:03:13 +00:00
AffectedArc07
6ee2bd72cb Tweaks 2021-05-25 13:12:25 +01:00
AffectedArc07
8fdf5960e4 DNM - Ref finder improvements 2021-05-25 11:00:13 +01:00
ppi13
01d2ffb08b Wires no longer gets destroyed by tesla (#16073) 2021-05-24 23:03:56 +01:00
Fox McCloud
51932b233e Merge pull request #16066 from AffectedArc07/more-db-bandaids
Another preferences bandaid
2021-05-24 15:42:15 -04:00
E-MonaRhg
5dc1c472fe Better haloperidol (#15848) 2021-05-24 16:29:34 +01:00
SabreML
4960f5440c Various Tweaks & Fixes (#15857)
* Stuff

* Grammar reviewer review

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

* Shuttle call HTML fix

And multiline announcements too, à la #15645.

The clean_input() was causing the message to be encoded twice, and only decoded once. Removing it still encodes the string.

* Loadout revert

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
2021-05-24 16:29:07 +01:00
Nokko
311c0b5317 Update description text of tentacle, match reality (#15975)
* Update description text of tentacle, match reality

The tentacle hasn't stunned for eons now, but the description said it did.

* Update code/game/gamemodes/changeling/powers/mutations.dm

Good review.

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/game/gamemodes/changeling/powers/mutations.dm

Looks good.

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Minor correction in harm tentacle text.

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2021-05-24 16:27:59 +01:00
SteelSlayer
e4bbd94d6a Robot_module and cyborg stack refactor (#13527)
* robot_module refactor

* some fixes

1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`

* review tweaks + other stuff

1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items

* fixes after upstream merge

* blank line for travis

* fixes and improvements

1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes

* more fixes + constructable frame runtime fix

* removes toy sword placeholder

remove comment

* remove these as well

* .amount to .get_amount(), really should have done this before

* refactors robot_upgrades to work with the new system

- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting

* moves some unemag logic to the module file, makes more loops typless

* farie review

* fox review

* affected review and more TM bugfixes

* fixes comment

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2021-05-24 16:24:25 +01:00
AffectedArc07
663eff7b5e MAP ROTATION PART 2 (#12345)
* MAP ROTATION

* Tweaks + New additions

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* Fixes improper naming

* Fixes map vote

Co-authored-by: dearmochi <shenesis@gmail.com>
2021-05-24 08:25:18 -06:00
AffectedArc07
51f673c7b5 Another preferences bandaid 2021-05-23 23:08:17 +01:00
dearmochi
122f09585e Player terror spiders now have their own orbit category (#16052)
* Terror spiders now have their own orbit category

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-05-22 23:21:18 +01:00
Qwertytoforty
97b758707e Removes the early classified announcement from the blob gamemode (#16049)
* Removes the early classified announcement

* removes the lies of the 30 seconds

* who needs sleep

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* compensating

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2021-05-22 21:54:03 +01:00
SabreML
02164ad0f0 Operator typos (#16048) 2021-05-18 20:55:41 +01:00
SabreML
ab73707d07 Finite money (#16044) 2021-05-18 09:59:26 +01:00
S34N
365fc87dbf Fixes a bug with solgov beret sprite (#16040)
* fix 1

* also catches a bug with TSF rep sechud icons
2021-05-17 12:51:15 +01:00
Adrer
95ef42ab17 SM engine APCs no longer short out during APC short/overload events. Again. (#16037)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2021-05-17 12:50:36 +01:00
datlo
abcab66a37 Fixes buying sacred flame in spellbook, misc spellbook improvements (#15817)
* Fix sacred flame, misc spellbook improvements

* Update code/game/gamemodes/wizard/spellbook.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/game/gamemodes/wizard/spellbook.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-05-16 11:48:42 +01:00
Farie82
e3ba0203b2 Adds grouped spawners. Makes spawning unique things easier. (#15956)
* Adds unique spawners
Makes spawning unique things easier.

* Refactor + comments update

* Some more info

* Slight refactor and path change.
group_id instead of key_override
comment changes

* File name change

* isnull check. Makes 0 as value valid
2021-05-16 11:41:06 +01:00
S34N
ae6f6148c2 Solgov tweaks (#15896)
* marines, solgov, and more!

* belts are belts

* forgot da hat

* swapped guns around, loadout hat no longer strong

* Update code/datums/outfits/outfit_admin.dm

* updated shading on uniforms

* yeets a null entry

* gas masks, flipped caps

* renamed gas masks

* merge conflicts

* dmi conflicts confuse me

* ARG mag update
2021-05-16 11:38:16 +01:00
SabreML
d2181a89bf Adds wiki links to antag greeting messages (#15939)
* Wiki Links Pass 1

* Wiki Links Pass 2

Ash Walkers,
Terror Spider spawns,
Terror Spider event,
Construct transfer,
Xenomorphs

* Less hardcoding
2021-05-16 11:36:26 +01:00
SabreML
3d6e072464 A lot more Cult fixes (#15161)
* Some fixes

1: ERT members can no longer be given as an assassinate/sacrifice antag objective.
2. Cultists attempting to teleport to a deleted rune will no longer be teleported into nullspace.
3. Re-ordered the cult Blood Rites spell code because it was bugging me. (sorry qwerty)

* Cult stuff

1: Cultists can no longer be chosen as a sacrifice target
2: Rune drawing is limited to one at a time (No spamming on one tile)
3: Removed some unneccesary `/improper`s from area names, for the cult Summoning locations
4: Changed a couple of colours to use defines

* QDELETED()

* Eye colour fix

* Reorganisation, Objectives, and Gender

The majority of the changes here are just reordering the procs, but there's a few fixes too:

1. Roundstart cultists now get given the 'servecult' objective.
2. Deconverting someone now removes their 'servecult' objective, so they won't be notified about target changes.
3. Stopped summoned ghosts from experiencing a spontaneous gender change.

* Screwdriver fix

* Prayer bead stripping

* Some more construct fixes

1: Fixed *all* holy constructs getting the 'Summon soulstone' ability
2: Fixed Wraiths getting their blue light reset to red after jaunting
3: Added a 'holy' variable to constructs, and made the holyification its own proc.

* qdeleted

* Construct Converting

Apparently you can convert holy constructs. Who knew!

* Another two weeks

Moved all the construct icon states to their own file, and fixed Nar'Sie constructs not getting a glowing effect.

* Grab fix

Fixed upgrading a grab having the ability to potentially transport the victim across dimensions.

* Not actually a cult fix but eh

Fixes: Runtime in outfit.dm, 114: bad number
And updates the cult corpse from legion spawns

* Teleport spell effect

Fixed the teleport effect for the spell being attached to the wrong mob.

* Small cleanup

* Eye colour cloning fix

* Veil Shifter

Fixed:
Runtime in cult_items.dm,355: pick() from empty list
Veil shifters not retaining any grabs after teleporting.

* Adjacent
2021-05-16 11:33:07 +01:00
hal9000PR
2c63bd9581 Fixes a couple bugs with nukes (#16008)
* fixes, code cleanup

* legiiiiiiiiit jade review

Co-authored-by: dearmochi <shenesis@gmail.com>

Co-authored-by: dearmochi <shenesis@gmail.com>
2021-05-16 09:37:56 +01:00
hal9000PR
9c4b73be1e Fixes self surgery with beds (#16004)
* fix

* mochi's suggestion. added check for self surgery starting

* line
2021-05-16 09:37:25 +01:00
S34N
509c1d5638 Fixes rogue characters on strip menu (#16009) 2021-05-16 09:35:00 +01:00
SabreML
e405d165d3 QM for Head 2021 (#15982) 2021-05-16 09:34:02 +01:00
Farie82
dd0ef504e2 Fixes genetics gene changes not working (#16035) 2021-05-16 09:29:34 +01:00
AffectedArc07
cb90c41034 Actually just do this 2021-05-15 21:07:31 +01:00
AffectedArc07
cc3d81df96 Server Update Update 2021-05-15 20:28:08 +01:00
AffectedArc07
e4a1ab04c7 Fixes an SQL issue (#16029) 2021-05-15 10:34:22 -06:00
Fox McCloud
bc41d93f36 Merge pull request #15811 from AffectedArc07/reagent-container-anchoring
Allows anchoring of fueltanks/watertanks/etc
2021-05-15 11:05:22 -04:00
Fox McCloud
89708fa00f Merge pull request #15549 from Kepplerx/Explosive-Implants-now-Always-available
Explosive Implants now always possible to activate (Meant for Nukies especially)
2021-05-15 11:01:02 -04:00
Fox McCloud
6eeb10b441 Merge pull request #15725 from dearmochi/eyes-default-lighting-alpha
Give eyes default lighting alpha of LIGHTING_PLANE_ALPHA_VISIBLE
2021-05-15 10:49:12 -04:00
Fox McCloud
d13b407646 Merge pull request #15885 from S34NW/tginhands
Ports /TG/ shotgun inhand sprites, adds custom ones
2021-05-15 10:47:01 -04:00
Fox McCloud
6c6b1b53f0 Merge pull request #15815 from datlo/heat-resist-fix
Make the heat resistance trait fully fireproof
2021-05-15 10:37:34 -04:00
Fox McCloud
f76efc8f73 Merge pull request #15863 from ppi13/look-maa-i-can-fit-8-crayons-up-my-nose
Adds the Elusive Black crayon
2021-05-15 10:31:22 -04:00
Fox McCloud
83e4554c1a Merge pull request #15919 from AffectedArc07/rgb-floor-tiles
RGB Light Tiles
2021-05-15 10:29:47 -04:00
Fox McCloud
3b2da56ab7 Merge pull request #15970 from Dragonkiller93/Dizziness_tick_fix
Removes duplicate code from handle_status_effects
2021-05-15 10:23:22 -04:00
Fox McCloud
a2057998f7 Merge pull request #15996 from farie82/genes-optimization
Optimizes handle_mutations_and_radiation. No more looping 55 times per human to do nothing
2021-05-15 10:13:31 -04:00
Fox McCloud
3dc40e74fd Merge pull request #15730 from AffectedArc07/no-more-myisam
Converts MyISAM tables to InnoDB
2021-05-15 10:03:45 -04:00
Dragonkiller93
95fd71989c Did a copy paste wrong.
Thanks dearmochi for the fix.

Co-authored-by: dearmochi <shenesis@gmail.com>
2021-05-12 14:13:39 -07:00
Iwanabeu
b321d278d9 Adds the code back to carbon/life and removes it from human. 2021-05-11 14:10:06 -07:00
S34N
472a05efe9 Fixes infinite charge stunbaton and stunprod exploit (#16012)
* Fixes infinite baton charge exploit

* moved it to the right proc
2021-05-11 10:29:00 +01:00
Iwanabeu
24704f205c Removes unneeded variable restingpwr. 2021-05-10 15:49:07 -07:00
Fox McCloud
1b65d50424 Merge pull request #15903 from AffectedArc07/mysql-fix-v-234243
Fixes character saving. Again.
2021-05-09 12:28:17 -04:00
AffectedArc07
972b80e34c oops 2021-05-09 16:15:17 +00:00
Dragonkiller93
544ed9e2c4 FIxes apiary text for queen placement. (#15954)
* FIxes apiary text for queen placement.

* Update code/modules/hydroponics/beekeeping/beebox.dm

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

* Sets gender of queen bee instead.

* Revert "Sets gender of queen bee instead."

This reverts commit 409df4a22d.

* Sets queen bee gender instead.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-05-08 22:09:44 +01:00
TwoCam
0aec0f4725 Removed someone's old email from the code (#16000)
* removed someone's old email from the code

* Update code/modules/newscaster/obj/newspaper.dm

Accepting AffectedArc07's suggestion.

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-05-08 22:08:47 +01:00
S34N
60edf50279 fix da safe (#16001) 2021-05-07 23:59:46 +01:00
AffectedArc07
314ce28c0b Merge branch 'master' into no-more-myisam 2021-05-07 15:28:47 +01:00