Commit Graph

20329 Commits

Author SHA1 Message Date
DamianX
c894ce81b0 Fixed human hard dels (#32417) 2022-04-18 11:03:05 -05:00
gurfan
6b995f559d [Cult 4] Rituals System, Return of Sacrifices, Cursed Blood (#32323)
* rituals

* hmm

* sacrifices

* aaaa

* aa

* commit

* tear reality

* helpful commit message

* merge

* remove eclipse/endgame stuff from other branch

* update pylon type name, fix conflicts

* fix warnings?

* flavor text updates and objectives

* re-enable conversion flavortext, blood dagger mindUI, new "rune skin" tattoo, cursed blood ritual, fix jittery seer effect, beno with a blood dagger

* im not writing a commit message

* override

* scoreboard and remove debug hud element

* syntax

* oh

* stashed changes

* fix warning

* Update code/_onclick/mindUI/bloodcult/cultist.dm

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

* Update code/datums/gamemode/factions/bloodcult/bloodcult.dm

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

* cleanup

* remove unused procs

* .

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

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

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

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

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

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

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

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

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

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

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

* Update code/game/gamemodes/scoreboard.dm

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

* Update code/game/turfs/turf_flick_animations.dm

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

Co-authored-by: DamianX <DamianX@users.noreply.github.com>
2022-04-17 16:03:03 +02:00
Hinaichigo
5aeacff6c4 Transfer eaten creature's stomach reagents to grue. (#32394)
* Update grue.dm

Transfer reagents in the stomach of the eaten to the eater.

* Update grue.dm

.

* Update grue.dm

bigger stomachs
2022-04-16 17:00:27 +02:00
samo priimek
05da0af656 borg banned spiderbots (#32385) 2022-04-16 16:53:54 +02:00
rob
f14ec3d657 clowns can pull out funny objects when digging in a surgical incision (#32368)
* jffffffffffffffff

* Update code/modules/surgery/implant.dm

Co-authored-by: Intigracy <intigracy@gmail.com>

* lllllllll

Co-authored-by: Intigracy <intigracy@gmail.com>
2022-04-16 16:51:46 +02:00
DamianX
2183251ac3 Fixed a bug that made the all-in-one grinder always consume all stacks (#32361) 2022-04-16 16:50:21 +02:00
SugarBone
2f8d487311 Update say.dm (#32360) 2022-04-16 16:50:07 +02:00
rob
e80575a97e fixes vox hairs not setting properly on vox monkeymen (#32355)
* ghj

* Update code/modules/mob/living/carbon/human/update_icons.dm

Co-authored-by: Intigracy <intigracy@gmail.com>

* ?

Co-authored-by: Intigracy <intigracy@gmail.com>
2022-04-16 16:47:20 +02:00
DamianX
74ef32ced4 Fixed a bug that caused the whisper for prayers to be delayed by a few seconds (#32349) 2022-04-16 16:46:53 +02:00
kane-f
d34a7dab82 Admin-only custom proc call reagent: Procizine (#32337)
* Admin-only reagent: Procizine

* Admin-only reagent: Procizine

* Admin-only reagent: Procizine

* Admin-only reagent: Procizine

* Admin-only reagent: Procizine

* Advanced options

* Cleanup

* Cleanup

* Attributes and overdose

* Descriptions

* Tolerance and withdrawal

* Reverts unatomic cleanup

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-04-16 16:46:23 +02:00
adacovsk
8bce34d7fb Prevent event trigger when few players (#32285)
* Update event_manager.dm

* Update event_manager.dm

* Update event_dynamic.dm

* Update event_dynamic.dm

* Update event_dynamic.dm

* Update event_dynamic.dm

* Modified event times

* Update event_dynamic.dm

* Update event_manager.dm

* Update meteors.dm

* Revert "Update meteors.dm"

This reverts commit 092fbcc5bb.

* Update event_manager.dm

* Update event_manager.dm

* Update event_manager.dm
2022-04-16 16:10:02 +02:00
kane-f
41dd41e020 Two singularities in the world can link on some occasions (#32193)
* 2 Singularities in the world at once have a 10% chance to link

* Sanity

* Sanity

* One important line

* Better selection method

* A white hole?

* A white hole?

* Requested name change

* Requested name change

* Fullstops

* Other.desc

* Sanity

* Changes method

* Fixes

* One line

* This counts too

* Make them act no matter what

* Crystal nerf

* Bracket

* Tweaks odds, does both ways

* While loop stuff, better way maybe

* Possible sanity

* Final stuff

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-04-16 16:06:05 +02:00
Eneocho
fdeae082c3 Aminoblatella, a cockroach-flavoured member of the Aminomicin family. (#32312)
* Aminoblatella

* Aminoblatella and its reactions

Also relocated synthparrot to be under aminomicin.

* Aminoblatella define

* tweaked values

* removing duplicate code as requested

tested

* Update Chemistry-Recipes.dm
2022-04-15 16:38:43 -05:00
adacovsk
d29f1d38f0 Fixes admins softlocking via Nar'Sie (#32320)
* Fix softlock

* Update voting.js

* Update voting.dm

* tweak

* Update gameticker.dm

* Update communications.dm
2022-04-14 03:16:58 -05:00
Eneocho
9a66689519 Revert "Changes ore smelted score to reflect ore value (#32374)" (#32393)
This reverts commit 98449dc150.
2022-04-14 01:33:05 -05:00
ShiftyRail
a8b971f128 Mulebot update (stolen content) (#31944)
* pushing whatever shit I had here before deleting this from my computer

* also this i guess

* Implements laser pointing + QoL + put it in lockers

Co-authored-by: zth <artii.ftw@hotmail.com>
2022-04-13 15:47:10 -05:00
Hinaichigo
d63936641e Breakable Objects v2 (#32255)
* Generalize breakability to obj. Standardize health and maxHealth for objs. Make flashlights, cameras, beakers, and wall-mounted lanterns breakable.

* Moved breakable.dm.

* Fix metaclub beepsky's maxhealth to maxHealth.

* Attempted to fix named argument error.

* Attempt to fix take_damage() derived proc named argument error.

* Attempt to fixed named argument error.

* Fragments can be obj not just item.

* Remove debug.

* .

* Fixed conflicting proc definitions.

* Attempt to fix runtime.

* Partly dissolve existing implementations of object health into general framework.

* Declare parent args in take_damage() proc overrides.

* Typo fix.

* Comment change.

* Change destroy to qdel.

* Update breakable.dm

Check for null teeth.

* Teeth check.

* .

* Gum check.

* Bugfixes and general object kicking.

* .

* fix kicking

* .

* .

* Kicking small items around.

* Throwing something at an object to break the latter.

* Fix storage inconsistencies.

* Nicer kick damage calculation.

* You don't need teeth to bite properly with a beak.

* Items can take damage landing in disposals.

* Undo that.. there's bug potential.
2022-04-13 08:57:21 -05:00
adacovsk
a3076a8ca0 Meteor announcement timing (#32300)
* Update event_manager.dm

* Update event_manager.dm

* Update event_dynamic.dm

* Update event_dynamic.dm

* Update event_dynamic.dm

* Update event_dynamic.dm

* Modified event times

* Update event_dynamic.dm

* Update event_manager.dm

* Update meteors.dm

* Update event_manager.dm

* Update event_dynamic.dm

* Update event_manager.dm

* Update event_manager.dm

* Update event_manager.dm

* Update event_manager.dm

* Update event_manager.dm

* Update event_dynamic.dm

* Update event_dynamic.dm

* Update event_dynamic.dm

* Update event_manager.dm

* Update event_manager.dm

* Update event_manager.dm

* Update meteors.dm

* Update meteors.dm

* Update code/modules/events/event_manager.dm

Co-authored-by: Exxion <exxion191@gmail.com>

* Update event_manager.dm

* Update meteors.dm

* Update meteors.dm

Co-authored-by: Exxion <exxion191@gmail.com>
2022-04-12 16:16:20 -05:00
kane-f
f473fdef04 Slime extract grenade fixes (#32282)
* Slime extract grenade fixes

* Slime extract grenade fixes

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-04-12 16:09:26 -05:00
DeityLink
d3f9ddb555 FixPoutinePlate (#32376) 2022-04-12 16:09:16 -05:00
DrSnips
a359d31234 I'm The Joker(tm) baby! (#32369)
* ImTheJokerBaby

* You get what you deserve.
2022-04-12 23:03:44 +02:00
samo priimek
42fc4cae26 horizontal silicon fixing (#32370)
* silicons get pwned less by tackles

making a silicon horizontal is now a 33% chance from 100
they will also upright themselves after a tackle

* horizontal borg changes

borgs now won't upright themselves after being flashed and tipped over
self uprighting(after being tackled) takes 30 seconds
the cover flying open when tipped increased from 2% to 25% chance

* crab uprighting

horizontal crabs now get uprighted instead of headpatted

* silicons get fucked by tackles a bit less

* revert balance changes

* reverts the changes for real

* borg tackling knockdown

should take the proper amount of time to upright now
2022-04-12 23:02:56 +02:00
kane-f
98449dc150 Changes ore smelted score to reflect ore value (#32374)
* Changes ore smelted score to reflact ore value

* Better description

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-04-12 23:01:32 +02:00
DeityLink
43e9b6260c FixAPCbigDumb (#32377) 2022-04-12 22:59:00 +02:00
kane-f
e48e9541ab Electrocute act grammar fix (#32380)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-04-12 22:58:23 +02:00
Eneocho
cc2821747f Fixing the vox nuggets and drumsticks II: Electric Boogaloo (#32362) 2022-04-08 09:39:44 +02:00
kane-f
2f11730f19 Light power check runtime fix (#32356)
* Map element area loading fixes

* Map element area loading fixes

* Map element area loading fixes

* Map element area loading fixes

* Retooling it as this

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-04-07 06:38:56 +02:00
Eneocho
8aee524d58 fix plastellium location (#32321) 2022-04-06 08:40:23 +02:00
Eneocho
30bc089476 Insectoid monkeycubes for sale in cargo. (#32322)
* roachcube

* roachcube box

* roach cubes
2022-04-05 17:42:35 +02:00
Exxion
4990a79704 Fixes aistatic hard del (#32342) 2022-04-03 02:01:36 +02:00
Exxion
8812b2a176 Revert "optimizes some movement code (#32332)" (#32340)
This reverts commit a71f9fbd44.
2022-04-02 15:02:29 -04:00
Exxion
c4e4459623 Fixes hobo shack windows (#32335) 2022-04-01 23:47:31 +02:00
ancientpower
a71f9fbd44 optimizes some movement code (#32332)
Co-authored-by: ancientpower <leereddit@gmail.com>
2022-04-01 13:17:38 -04:00
Eneocho
280247adea fixes liberator missing icon (#32315) 2022-03-29 19:00:34 +02:00
DamianX
62f31ad907 Emagging things no longer creates permanent sparks (#32309) 2022-03-27 23:59:42 -05:00
adacovsk
f4f39393aa Removes darkmode message (#32278)
* Update darkmode.dm

* Update browserOutput_dark.css

* Update browserOutput_dark.css
2022-03-27 19:21:43 +02:00
DamianX
eb362a0ca9 Project mind messages' font is now bold (#32263)
* Project mind messages' font is now bold

* Boldified mushroom telepathy as well
2022-03-27 19:10:55 +02:00
Kurfursten
d9438055a2 Spreadable Spaces (#32291) 2022-03-27 19:07:11 +02:00
kane-f
d600035a9d Fixes vaults spawning turfs outside of random vault area (#32299)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-27 19:06:59 +02:00
DamianX
e47d2b678a Fixed attack logs damage (#32298) 2022-03-26 22:39:12 -04:00
Eneocho
93e53591b5 sili citrus hotfix (#32280) 2022-03-24 13:56:43 +01:00
DamianX
4ed0dcc87a QoL changes to remote view (#32267) 2022-03-21 15:54:01 -05:00
kane-f
a1787011f0 [MDB IGNORE] Cargo crate forwarding (#31967)
* Cargo crate forwarding

* Makes forwarding screen show up

* Crate info, new manifest handling, stamp checking, other stuff

* Station name thing fix

* Time limit system

* Server config to allow this on roundstart

* Centcomm order ones now

* Fixing display

* Makes stacks nicer

* Better sanity checks, will still need to tweak how stacks work and test them more

* Some better crate access for centcomm orders

* Some example misc orders not from either

* Small time limit adjustment

* Basic time left tracker, might improve

* Bones of weighing

* Put this after weighing them maybe, easier

* Wrong one

* Icon for weigher

* Beginning item itself

* Full functionality of item

* Adding the machine to forwardings

* Layer tweak

* User feedback, paper insertion fix

* Fixed time formatting

* Stamping and weighing feedback for checking if done

* Better reason system, failure feedback on what crate too

* Last reason

* Makes names check for duplicates in players too

* Final fix, makes enable/disable button display right on supply console

* Weights the centcomm variant forwards properly, also balances number of crates sent to people in cargo staff

* Random mob cage order

* Mob needed for check too

* Better to do it like this

* Multiplier based on cargo account funds

* Proper accounts sent money to

* Better transaction details

* Forwarding cooldown

* Centcomm request persistence, makes them come back in future rounds as cargo forwards

* Forwards too

* Better name system

* Much better system that won't send out the same previous order twice, and will persist from more than one round

* Extra check

* Another check

* Another check

* Another check

* Better path checking

* Better logging and some fixes

* Allows random mob crate to go back, fixes per unit crates sent back runtiming

* Makes crate weigher more constructable

* Adds weighers to map instead

* Better distribution code

* Preserves the subtype for supply pack and centcomm orders for more accuracy of persistence

* Text2path

* Much nicer formatting of persistence

* Cleans up request persistence too

* Forward amount override for debugging, example config stuff

* More specific crate denial reason

* Makes new persistence actually work, tested

* Forgot this

* Optimising this into one persistence task

* Even more

* Even more

* Gives indices names for even less rigid access

* Less immulsion shattering

* More specific denial

* Should fix cart crates

* Fix

* Current hotfix solution pending tidier one

* Taking this out of the loop, had no reason to be in there

* Better debug log on cooldown formatting

* Some fixes

* New refactored system without hotfix

* Also deletes these

* Everything should work now

* Moving these into supply shuttle

* Keeps these for persistence

* Makes persistence work again, thins it down with probability

* Makes names work here too

* Some name fixes

* Scoreboard

* Number fix

* Round score deduction for failed forwards

* Logs this

* Adding part quality stuff

* Fix

* Updates to new scoreboard format

* Extra checks building system for more realistic centcomm orders

* Doing a few more of these

* Fix

* All sci orders built

* DNA injectors

* Virus stuff, all extra check builds done

* Fixes

* Reformat for info consistency

* Making artifacts built to extra checks, real last one

* GNA symptom disk, real real last one

* Condition fix

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-21 15:50:05 -05:00
Hinaichigo
7badc3be8f Message upon offering to hand someone an item (#32260)
* Update give.dm

Message to indicate item offer attempt.

* Update give.dm

Remove unneeded \the's.
2022-03-20 21:45:15 +01:00
kane-f
ec86a84fb8 Allows monkey recyclers to recycle all non-sapient animals (#32156)
* Allows monkey recyclers to recycle all non-sapient animals

* Better grammar, plus prevents silicons from being recycled easily

* Better system

* Body archives of sapient mobs

* Transferring mind

* Sanity

* Fix

* Less ambiguous cube name

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-20 15:31:22 -05:00
DamianX
c201cf1b68 Plasmaman and vox helmets no longer prevent determining the wearer's gender (#32209) 2022-03-20 15:29:07 -05:00
DamianX
d65031a9e3 Fixed head reattachment bugs (#32259) 2022-03-20 15:25:00 -05:00
DamianX
3e16faa0c7 Fixed plasma reagent runtime (#32216) 2022-03-20 11:50:46 +01:00
Eneocho
282bf8bcbb you think god stays in heaven because he's afraid (#32226) 2022-03-20 11:50:31 +01:00
Eneocho
408d807375 Makes janitor bleach useable. (#32228) 2022-03-20 11:50:14 +01:00