Commit Graph

27006 Commits

Author SHA1 Message Date
moo
9bad1e3688 Merge pull request #41830 from subject217/pills
T/F pill.dm
2018-12-07 12:41:44 -05:00
Jordan Brown
6863b758e6 Merge pull request #41828 from ExcessiveUseOfCobblestone/abba-song-here
[S] Fixes Base Tech Also Giving You Mad Dosh
2018-12-06 22:25:24 -05:00
coiax
be89c6aa3c Fixes missing . in clown car honking (#41816) 2018-12-06 20:06:47 -05:00
Jordie
6f1884341a fix for opening player panel for clientless mobs (#41826) 2018-12-06 20:01:44 -05:00
moo
fa67981f1c Merge pull request #41814 from coiax/shut-up-cryo
Cryo tubes only ever send one radio message when finishing
2018-12-06 15:05:19 -05:00
moo
b0073fddb8 Merge pull request #41754 from coiax/always-in-the-way
Adds Physically Obstructive quirk
2018-12-06 12:06:03 -05:00
81Denton
d5773eea2d Fix 4-way H/E manifold icon (#41809)
The icon state "manifold4w" doesn't exist for 4-way H/E manifolds, which is why
their icon doesn't show up in Dream Maker. This PR fixes that.
2018-12-06 00:00:24 -08:00
Unknown
70c62fe355 T/F pill.dm
this time with no merge conflicts
2018-12-05 23:14:32 -08:00
oranges
11d6a7ad9b Merge pull request #41746 from ExcessiveUseOfCobblestone/fix4u
Crossbow/KA & Reflect Blob/Aiming Beam Fixes
2018-12-06 19:54:05 +13:00
moo
32b2a884a5 Merge pull request #41787 from subject217/pcfix
Fixes an issue wherein plasma cutters accepted infinite plasma
2018-12-06 01:44:54 -05:00
moo
20743d48ce Removes unneccessary check
Admin now uses the proper arg instead of typecheck
2018-12-06 01:30:23 -05:00
ExcessiveUseOfCobblestone
65d19ef841 Update _techweb.dm 2018-12-06 01:25:11 -05:00
moo
d057de9b6e Merge pull request #41468 from Steelpoint/AdvMedkit
Advanced First Aid Kit
2018-12-05 11:01:48 -05:00
MrDoomBringer
bb7be02d99 + instead of []
Co-Authored-By: coiax <yellowbounder@gmail.com>
2018-12-05 01:04:32 +00:00
coiax
8da281ff50 Nuclear operatives have a christmas tree during the festive season (#41788)
* Nuclear operatives have a christmas tree during the festive season

🆑 coiax
add: Nuclear operatives have a Christmas tree during the festive season.
/🆑

Minor buff to nuke ops during the Christmas period when trees have presents,
as they'll have access to random items just like the crew.

* Adds a second lightbulb to the bathroom

* Christmas tree SPAWNERS rather than LANDMARKS
2018-12-04 19:35:21 -05:00
Jack Edge
78b7a6664e Cryo tubes only ever send one radio message when finishing
🆑 coiax
add: Cryo tubes will only ever send one message, even if they are auto ejecting.
/🆑

Just put them on the same line, jesus.
2018-12-04 23:15:42 +00:00
moo
e54d8a4d5c Merge pull request #41784 from Tlaltecuhtli/patch-1
Drops Dragnet Stun And Reduces Dragnet Trap Break-Out Time
2018-12-04 17:56:25 -05:00
Jordie
8a66665e95 Ban system and interface update (#41176)
Spiritual successor and extension to #17798, an almost entire rebuild of the SQL ban system backend and interface.
Bantypes are removed per #8584 and #6174. All bans are now 'role bans', server bans are when a ban's role is server. Admin bans are a column, meaning it's possible to ban admins from jobs.
Bans now have only an expiry datetime, duration is calculated from this when queried.
unbanned column is removed as it's superfluous, checking unban status is now done through checking unban_datetime. unban_round_id column added. Each ip and computerid columns rearranged so ip is always first, like in other tables. Bans now permit a null ckey, ip and computerid.

Ban checking is split into two procs now is_banned_from() does a check if a ckey is banned from one or more roles and returns true or false. This effectively replaces jobban_isbanned() used in simple if() statements. If connected a client's ban cache is checked rather than querying the DB. This makes it possible for a client connected to two or more servers to ignore any bans made on one server until their ban cache is rebuilt on the others. Could be avoided with cross-server calls to update ban caches or just the removal of the ban cache but as is I've done neither since I think it's enough of an edge case to not be worth it.
The second proc is is_banned_from_with_details(), this queries the DB for a role ban on a player's ckey, ip or CID and returns the details. This replaces direct queries in IsBanned.dm and the preferences menu.

The legacy ban system is removed.

The interfaces for banning, unbanning and editing bans have been remade to require less clicking and easier simultaneous operations. The banning and jobban panel are combined. They also store player connection details when opened so a client disconnecting no longer stops a ban being placed.

New banning panel:
Key, IP and CID can all be toggled to allow excluding them from a ban.
Checking Use IP and CID from last connection lets you enter only a ckey and have the DB fill these fields in for you, if possible.
Temporary bans have a drop-menu which lets you select between seconds, minutes, hours, days, weeks, months and years so you don't need to calculate how many minutes a long ban would be. The ban is still converted into minutes on the DB however.
Checking any of the head roles will check both of the boxes for you.
The red role box indicates there is already a ban on that role for this ckey. You can apply additional role bans to stack them.

New unbanning panel:
Unbanning panel is now separate from the banning panel but otherwise functionally the same.

Ban editing panel:
Actually just a modified banning panel, all the features from it work the same here.
You can now edit almost all parameters of a ban instead of just the reason.
You can't edit severity as it's not really part of the ban.
The panels have been tested but I've not been able to get my local server to be accessible so ban functionality isn't properly confirmed. Plenty of testing will be required as I'd rather not break bans.



cl
admin: Ban interface rework. The banning and unbanning panels have received a new design which is easier to use and allows multiple role bans to be made at once.
prefix: Ban search and unbanning moved to unbanning panel, which is now a separate panel to the old banning panel.
/cl
2018-12-05 08:48:37 +13:00
moo
7088082b49 Merge pull request #41474 from Steelpoint/SWAT2
MK II. SWAT Suit
2018-12-04 12:40:04 -05:00
moo
f971e02a46 Update code/modules/clothing/spacesuits/hardsuit.dm
Co-Authored-By: Steelpoint <alexander.henley@hotmail.com>
2018-12-04 13:32:44 +08:00
moo
938397a8ee Update code/modules/clothing/spacesuits/hardsuit.dm
Co-Authored-By: Steelpoint <alexander.henley@hotmail.com>
2018-12-04 13:32:36 +08:00
moo
a5b78cda9b Update code/modules/clothing/spacesuits/hardsuit.dm
Co-Authored-By: Steelpoint <alexander.henley@hotmail.com>
2018-12-04 13:32:29 +08:00
moo
c6747837c5 Update code/modules/clothing/spacesuits/hardsuit.dm
Co-Authored-By: Steelpoint <alexander.henley@hotmail.com>
2018-12-04 13:32:22 +08:00
Unknown
89f17e2a40 grammar fix
haha yes I speak english
2018-12-03 17:15:12 -08:00
Unknown
b7f7d7b203 does the cobblestone
my cell is round and full
2018-12-03 17:02:08 -08:00
moo
fb1e6b25f6 Merge pull request #41766 from 81Denton/hothead
Fixes heat sources not igniting things
2018-12-03 19:40:49 -05:00
Unknown
6eebe958c9 The the 2018-12-03 12:37:09 -08:00
Unknown
d65210ed8c fixes the issue, adds a to_chat when it's full
please give GBP
2018-12-03 12:29:14 -08:00
Steelpoint
aff1dcfa57 Update hardsuit.dm 2018-12-04 02:06:32 +08:00
Tlaltecuhtli
c449e0b23b dragnet changes 2018-12-03 17:36:16 +01:00
Jack Edge
64e0cfd4e9 Traits are now sorted by positive,negative,neutral and then by name 2018-12-02 23:51:41 +00:00
moo
ae53b206d1 Merge pull request #41276 from kriskog/monkeyrecycler
Monkey recycler connected to xenobio consoles, recycler returns reduced
2018-12-02 17:02:59 -05:00
Jack Edge
564e38c10b Merge branch 'master' into always-in-the-way 2018-12-02 19:50:51 +00:00
Denton
877d3cea69 Fixes heat sources not igniting things 2018-12-02 19:06:20 +01:00
XDTM
334a1d44f2 Adds the Curse of Madness to wizard spellbooks (#41496)
* Adds the Curse of Madness to the wizard's spellbook

* anti-magic check

* Update code/modules/antagonists/wizard/equipment/spellbook.dm

Co-Authored-By: XDTM <heliumt@yahoo.it>

* Magic traumas + magic immunity prevents spellcasting

* feedback

* fix

* fax

* Added two new special traumas

* I'm not mad, everyone else is

* New minor trauma, godwoken gives holy

* stalking phantom trauma

* math

* heartbeat

* Custom message
2018-12-02 09:46:10 -05:00
Steelpoint
e7c54ebf0e Adds Beanbag Slug Shells to Sec Protolathe (#41640)
* InitialCommit

* Update autolathe_designs.dm

Alter price
2018-12-02 09:42:34 -05:00
coiax
4b799f7c88 Powered broken lights occasionally emit sparks (#41660)
* Powered broken lights occasionally emit sparks

* Less demanding

* SECONDS define

* Slower and defines
2018-12-02 09:40:03 -05:00
XDTM
2712e62ee5 [Ready]Desynchronizer (#41341)
* Desynchronizer

* type

* Update code/game/objects/items/devices/desynchronizer.dm

Co-Authored-By: XDTM <heliumt@yahoo.it>

* Update code/game/objects/items/devices/desynchronizer.dm

Co-Authored-By: XDTM <heliumt@yahoo.it>

* Update code/game/objects/items/devices/desynchronizer.dm

Co-Authored-By: XDTM <heliumt@yahoo.it>

* Update code/game/objects/items/devices/desynchronizer.dm

Co-Authored-By: XDTM <heliumt@yahoo.it>

* Update code/game/objects/items/devices/desynchronizer.dm

Co-Authored-By: XDTM <heliumt@yahoo.it>

* fixes and cool text procs

* anti-abuse measures

* typery

* cooldown

* techweb salvage

* icon and visual effect plus bugfix

* let's not push runtime
2018-12-02 09:34:41 -05:00
Jordan Brown
95f20ee827 Merge pull request #41679 from 81Denton/remove-hotspot
Reverts "hotspot_expose() will now heat the turf's air if it fails to create a hotspot"
2018-12-02 09:30:42 -05:00
Jordan Brown
6e6b01c742 Merge pull request #41692 from kriskog/beamrifle
Beam Rifle - From 10 to 5 shots per charge
2018-12-02 09:30:08 -05:00
skoglol
ec390a2657 updated to also cover click shortcuts 2018-12-02 10:38:37 +01:00
skoglol
ec159f9b07 Merge 2018-12-02 10:24:38 +01:00
coiax
7325357a48 Scrying orb now grants sixth sense (and xray) to whoever possesses it (#41643)
cl
add: A wizard's scrying orb now grants both xray vision, and the ability to hear the dead to whoever possesses it.
balance: However, as soon as the orb is no longer in your possession, these abilities fade.
/cl

This was @XDTM's idea, when he implemented near death experiences.

It works even when in your backpack.

This also adds the TRAIT_XRAY_VISION, for non-genetic, non-eyeball sources of xray.

Why? Having a wizard talking to ghosts means it looks like he's talking to thin air. Also, this makes scrying orb a little more active in its knowledge gathering. Ghosts will have the chance to mislead the wizard with whatever they're talking about.
2018-12-02 20:39:05 +13:00
coiax
b46d0e0c50 Adds the spontaneous brain trauma event (#41665)
cl coiax
add: Adds the Spontaneous Brain Trauma to the event pool. Sometimes your brain just goes a little wrong.
/cl

Brain traumas are !fun!, and even more !fun! than your appendix getting inflamed.
2018-12-02 20:36:05 +13:00
Jordie
c67f2767b1 Moves changeling power feedback to sting_action (#41653)
All powers that don't have their own feedback calls, Absorb DNA and Linglink, now call ..() after any cancelling returns.

Fixes #41621, Absorb DNA would do an extra feedback call from try_to_sting()
2018-12-02 20:30:47 +13:00
Rob
6b8bfb2f5c [EXTRAREADY][AAAAAA] Hey revolver, don't mothers make good fathers? (#41620)
tweak: Suppressed and dry fire sounds are now stored as a variable, and can be edited on a per gun basis.
sounddel: The standard gun dry fire sound was collapsed to one sound instead of 4. They were all just pitch variations anyways, which is now covered by built in sound pitch variation.
soundadd: Revolvers now have a unique gunshot sound that is slightly different for 357 and 38.
soundadd: Revolvers now have a unique dry fire sound.
soundadd: Revolvers now make a unique noise when emptying them besides just the sound of shells falling out.
soundadd: Spinning a revolver such as the Russian Revolver now makes a sound.
spellcheck: Syndicate sniper kit now includes a suppressor instead of a "supressor."
2018-12-02 20:30:09 +13:00
tralezab
b794d3d4aa Magic Survivalists can have spellbooks count if they did not use them (#41610)
cl
tweak: spellbooks now count towards the survivalist objective if they were not used.
/cl

fixes #40857

It feels like shit if you don't know spellbooks don't count and you just lose out of nowhere. It also doesn't make sense for them to count if they still have magic powers.
2018-12-02 20:25:12 +13:00
XDTM
e053faabd0 Adds the hypnotic flash to the uplink (#41604)
cl XDTM
add: Added the Hypnotic Flash to the uplink for 7 TC.
add: The Hypnotic Flash temporarily confuses and pacifies those it's used on.
add: If the victim is in a mentally vulnerable state (hallucinating, insane, reduced mental activity) they will instead fall into a trance, and will be hypnotized by the next words they hear.
/cl

Controlled hypnosis for traitors. Usual caveats apply: Mindshield prevents the trance effect (but not the confusion/pacification) and it can still deconvert from hypnosis; a new hypnosis will override the previous one; and most importantly for any ambiguity the interpretation is mostly up to the victim, so it's not a 100% sure conversion (i'm hoping people won't use this clause to just ignore it).
2018-12-02 20:19:42 +13:00
skoglol
2f71d7d096 [READY] Adds click shortcuts to xenobio console. (#41575)
cl Skoglol
add: Added click shortcuts to xenobiology console. You no longer have to aim with the camera eye to do slime science.
/cl

https://www.youtube.com/watch?v=zP5GP3sc0e0

Xenobiology is kind of a pain in its current state, where you gotta aim with the camera eye. The eye has inconsistent speed, and is prone to lag. This addition allows you to click the things you wish to manipulate instead, which is a lot smoother.

I've added a help action that explains the controls.
Threw together a icon for the button:

For now, shortcuts are:
Slime: Shift click slime to pick up, turf to drop all. Ctrl click to scan, alt click to feed potion.
Monkey: Ctrl click critted monkey to pick up, turf to drop a new one.
2018-12-02 20:13:52 +13:00
ShizCalev
9997f956b0 Fixes ODing on crank/other chems, viruses, and other things damaging/healing robotic limbs. (#41593)
cl ShizCalev
fix: Fixed chem OD's causing damage to robotic limbs.
fix: Fixed wood golems repairing robotic limbs every tick of life()
fix: Fixed vampires repairing robotic limbs every tick of life()...
fix: Fixed shadowpeople healing robotic limbs every tick of life()
fix: Fixed poppeople healing robotic limbs every tick of life()
fix: Fixed adjustBruteLoss and adjustFireLoss not properly discriminating for limb status types.
tweak: Fixed bibles healing robotic limbs, because your false deity can't fix SCIENCE.
fix: Fixed the Starlight Condensation, Nocturnal Regeneration, Tissue Hydration, Regenerative Coma, and Radioactive Resonance virus symptoms repairing robotic limbs.
/cl

Gonna be away the next two weeks, so if there's anything major after today just go ahead and close it and I'll fix it when I get back.
2018-12-02 20:12:22 +13:00