Commit Graph

1389 Commits

Author SHA1 Message Date
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
Eneocho
280247adea fixes liberator missing icon (#32315) 2022-03-29 19:00:34 +02:00
Eneocho
d35d5a8bdf liberator gun buff (#32236)
* liberator gun buff

* blube

* alright
2022-03-19 15:49:35 +01:00
d3athrow
642b843d9d Revert "[MDB IGNORE] Liquid reagent puddle system (#32169)"
This reverts commit a5b08f232a.
2022-03-17 14:13:40 -05:00
DamianX
30b5a2ac1d Fixed a bunch of hard dels (#32186) 2022-03-11 19:14:04 -06:00
kane-f
a5b08f232a [MDB IGNORE] Liquid reagent puddle system (#32169)
* Actual icon

* Puddle reformatting

* Basis of smoothcode

* Moving puddle code into a turf reagent system, reformat and overhaul

* Make this act on splashing, for now

* More work on standardising behaviour

* More standardisation, should ideally make spread work nicer

* Some tweaks

* Fixes

* Makes it work in practice, code slimmed down

* More standardising

* Redone calculations

* Fixes infinite reagents

* Puddle scaling with volume

* Presets for mapping

* Actual stuff

* Better way

* Get actual turf

* Blacklisting some of these

* Evaporation rate

* Removing old splash verb, adding reagents to a turf should do this by default now

* Makes these invisible

* Makes this not cleanable, for now

* Standardising this into reagent stuff

* Fixes

* Space clears reagents

* Basic viscosity system

* Adds some rudimentary values

* Space cleaner thng

* Beginning rework of this, removing unused fuel type

* Fuel puddle rework

* Fuel puddle rework

* Find and replace mishap

* Removing from .dme

* Removing unused variable

* Rewriting the preset init ones

* Redoing mapped puddles

* Makes sure these are gone

* Type fix

* New plane and layer

* Makes slip work

* Fix

* Fix

* Puddles can now react to crossing over it

* Proper bracketing

* Puddle values

* Current puddle reference to save on locating

* Nicer smoothing

* Tweaking values

* Water color tweak

* Greatly simplifies wet floor puddles

* Simplified line

* No reason for invisible puddles anymore

* Makes wet/dry vaccuum work with this

* Mop

* Reformatting how reagents are held

* Allows space cleaner to clean some kinds of puddles

* Fixing

* Moving this to simulated level

* Fixes puddles not being made anymore

* Standardised alpha

* Removing this for now

* Fixing chem dupe issue for when this matters

* Server config for behaviour

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-11 19:13:44 -06:00
adacovsk
c5917aca71 Fix flare (#32040)
* Update flare.dm

* Update flare.dm

* Update flare.dm
2022-02-24 23:51:21 +01:00
adacovsk
b30153715d Scoreboard organization/optimization (#32094)
* Scoreboard

* Update next_map.dm

* Update gameticker.dm

* Update role.dm

* ugh

* safe me

* added dat to every proc

* Update scoreboard.dm

* Update scoreboard.dm

* Update department_score.dm

* turfssingulod

* Update misc_score.dm

* Update scoreboard.dm

* Update scoreboard.dm

* Update mobs.dm

* Update items.dm

* Update stunbaton.dm

* Update human_attackhand.dm

* Update living_defense.dm

* Update misc_score.dm

* Update swords_axes_etc.dm

* Update human_attackhand.dm

* Update misc_score.dm

* Update misc_score.dm

* Update scoreboard.dm
2022-02-22 17:39:14 +01:00
kane-f
3bd3f877b3 Slight procgun fix (#32031)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-02-10 06:53:42 +01:00
west3436
010210e724 Sock Weapons (#31835)
* Sock weapons

* Removes debugging in-hand sprites.

* Increases brick sock size to medium and enables deconstruction.

* oops lol

* Unique sprites, in-hand sprites, and better sounds.

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Prevents glued soap from being used in construction

* Retains the soap being used and transfers fingerprints.

* reee

* Revert "reee"

This reverts commit e3e02bd173.

* forgot to include this lol

* Retains sock + fixes exploit.

* Optimization & removal of grab intent requirement for decon.

* Brick socks no longer cost 2 bricks.

* Displays assembly message following construction.

Co-authored-by: DamianX <DamianX@users.noreply.github.com>
2022-02-09 04:12:52 +01:00
kane-f
bef804642f Attack log admin message tweaks (#31949)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-01-29 14:56:44 -06:00
adacovsk
0ac93cb17c Fixed Alien HUD (can see in the dark) (#31918)
* Fixed Alien HUD (can see in the dark)

* Update energy.dm

* neurotox does more
2022-01-29 05:06:52 +01:00
SonixApache
1e2d0f1de6 adds 'detain' as option for lawgiver stun (#31841) 2022-01-19 07:17:16 -06:00
kane-f
5d9af4cc30 Adminspawn-only proc call gun (#31732)
* Adminspawn-only proc call gun

* Can't forget this

* Let there be gunk

* Here too

* Here too

* This is nicer

* Less messy in some cases

* Should be this permission to be consistent

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-01-10 19:01:55 -06:00
kane-f
d0949323b8 More time agent fixes (#31790)
* Fix one

* Fix for pinpointer targeting

* Fixing anomaly stuff

* Fixing area in this

* Fix for compiler warning

* Better pinpointer

* Better pinpointer

* Better pinpointer

* Oh it was this

* Proper name

* Fixes typo

* Sanity

* Don't want this

* Disambiguating name for locate objective's sake

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-01-10 19:01:25 -06:00
Kurfursten
1c5e9e8c93 The Liberation is at Hand (#31666)
* The Liberation is at Hand

* Liberators now charge much faster

* icons
2021-12-26 00:03:20 -06:00
jellyveggie2
37b6fcd9a4 Palette crayon fix (#31692)
* Fix crayons bricking palettes

* Fix colors from pens (and now crayons) refusing to mix with other colors on palette
2021-12-25 11:31:31 -06:00
Kurfursten
65c64a194f Dragonshell Buff (#31665) 2021-12-25 11:31:06 -06:00
Optimism333
c74f8ed23d Ayy Laser Guns and UFO Vault Update (#31592)
* Ayy_Laser_Guns_and_Hostile_Mob_Update

* Fixed_In-hand_Inconsistency

* Even_Rounder_Ufo

* Grey_Leader_Soldier_and_Explorer_Suits_Hold_Disintegrators

* Made_Immolation_Ray_Slightly_Stronger_40->45

* Heavy_Disintegrator_Can't_Be_Dual_Wielded

* Armor_Doesn't_Do_Anything_For_Mobs_Anyways

* Hostile_Grayys_Attack_Unconscious_Players

* DOH

* Gives_Space_Greys_A_Faction

* Simpler_Faction_Name

* A_Little_Less_Conversation

* Adds_Blast_Shields_to_Ufo_Bridge

* Some_Finalizing_Edits

* Some_Cleanup_and_Desc_Tweaks

* Removed_Redundancies

* Grey_Hostiles_Speak_Quack
2021-12-20 20:36:23 -06:00
SonixApache
572b4b9e98 magazine color marking with crayons (#31656)
* magazine color marking with crayons

* check for icon

* you did that, idiot
2021-12-20 11:23:57 -06:00
jellyveggie2
00c0026ce4 Make plastic sortable for recycling, and make a multitude of items recyclable (#31593)
* Most plastic items are now recyclable, under the label "miscellaneous". Amounts to be balanced, currently same as recipe.

* Mineral tiles can be recycled

* Gold teeth and collection plates can be recycled

* Recycling sorter will now empty out crates and closets before sorting, if possible

* New recycling material category for the sorter, plastic. Many items updated to be considered such.

* derp recycling sorter fixes

* derp what was the point in creating a category otherwise

* just in case

* dorf recycling

* Smithing recycling? It's been a while and I don't remember what I was up to.

* Fix #28612 (You cannot recycle coins into their base metal)

* Blacksmithing recycling nearly done now,
Just some weirdness with tower shields left, plasteel component doesn't transfer materials correctly.

* All sheets with materials defined should actually have a .materials now, so I can grab an alloy sheet and use it's materials to decide what's being transferred instead of trying to guess of it's material type/hoping it has a material type at all. Fixes tower shields not having plasma from plasteel.
There's still a TODO in how materials are transferred to blacksmithing products, and a bug that predates my changes, but I've no idea how to go about either and this whole PR feels unatomic enough as it already is. I just wanted to be able to recycle plastic bags man, not overhaul crafting.

* Sorter will now consider crates it can't open as non-recyclable, since the recycler simply can't deal with those and it wouldn't make sense to create another way to unlock locked crates anyway. No more clogged recycling because of a closed crate.

* Update boomerang materials

Co-authored-by: Jellyveggie <39123109+Jellyveggie@users.noreply.github.com>
2021-12-20 10:59:06 -06:00
kane-f
1ffec4dc64 Standardises opposite directional returns. (#31603)
* Standardises opposite_dirs and reverse_direction

* Moves this here, makes more sense in this file

* Compile

* Compile test for this

* Fix

* Cuts out now useless proc

* Cuts this down too

* Additional helper

* Better as a define

* Using this macro in practice

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-12-13 19:22:55 -06:00
Exxion
ad228795b0 Approximately the same (#31468) 2021-11-29 13:18:06 +01:00
DeityLink
9e07e6d9fe Turning a wheelchair into an assembly no longer makes it lose its motorization and such (#31396)
* Turning a wheelchair into an assembly no longer makes it lose its motorization and such

* preserve instance

* unlock atoms
2021-11-27 22:53:22 -06:00
kane-f
78d4850c81 Allows "peeping" through holes in walls (#31333)
* Peephole branch

* Trying new way to control these walls

* Now works mostly ideally

* Sanity?

* Fixes

* New checks

* Removes control datum altogether, this works much nicer

* Removes control datum altogether, this works much nicer

* Some sanity

* Changes

* Better peep hole icon

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-11-24 10:59:47 -06:00
Exxion
472e49c833 check_contents (#31217) 2021-11-05 21:47:06 +01:00
DamianX
a4438724c9 Changed all relative paths to absolute (#31078) 2021-10-18 16:28:55 -05:00
kane-f
5c2eed6ff3 Explosion attack log update (#31070)
* Ex_act() logging update

* Fixes

* Priming

* Fixes

* Fixes

* More mob attack logs

* Fixes

* Other carbons

* Forgot these

* Forgot these

* Possible fix

* Last resort

* Obvious typo gets ignored

* Using fingerprints for more logging

* Basis of explosion system using it too, only for plasma cigars for now

* Fix

* Moved here

* TTV log fix

* Formatting ckey in too

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-10-16 02:46:34 -05:00
Bultra
ce9cee48c4 make whip describbon (#31083) 2021-10-16 02:42:14 -05:00
DamianX
ed66243ef6 Fixed supersoakers not working (#31021) 2021-10-09 01:56:10 -05:00
DeityLink
a7ddac5c97 [Cult 4] "NAR-SIE'S HOLIDAYS" , aka "The End of Cult 3.0" (#30672)
* day 1

* day 1.1

* day 2

* day 3

* day 4

* day 5

* day 5.1

* day 6

* day 6.1

* day 7

* day 7.1

* day 8

* day 9

* day 10

* day 11

* day 11.1

* 11.1.1

* day 12

* and on the 13th day, he looked upon his work, and was pleased with what he saw

* 13.1

* day 14

* day 15

* day 16

* day 16.1

* fixing conflicts after rebasing post-Europa removal

* day 17

* day 17.1

* day 18

* day 18.1

* day 19

* day 19.1

* day 20

* day 20.1

* day 21

* day 21.1
2021-10-08 20:32:34 -03:00
kane-f
37f4fee47f Shuttle floor and wall update (#30963)
* Refactors shuttle turfs into normal types of floors and walls

* Moving macro

* Redundant vars

* Brig floor

* Better as this type

* Last tweaks on types

* Some more sanity

* Better way

* Now smoothing should work

* Well, if you say so

* Adding these

* Oh actually we do need it

* Smoothwall support

* Fixed corners

* Stock icon state for this

* Converting to smoothwalls

* These too

* More optimisations

* Smoothing now more like original

* Typos

* Icon cleanup

* More progress

* Diag walls in practice

* Fixing box

* Actual box fix

* Slight tweak

* Weird dir 3 thing gone

* Repath

* More cleanup

* Even more

* 2 more

* Moooore cleanup

* More icon trimming

* More cleanup

* Removing redundant type

* More refactor

* Bswall cleanup done

* Non corner walls done

* Beginning diag cleanup

* Last of corners refactored

* Icon cleanup

* Redundant dirs

* Bagelstation

* Fixing most lightspeed ships

* Boxesstation

* Lot of centcomm shuttles fixed

* lowfat, roid, packed

* Roid fix, waystation

* Deff, meta

* Horizon

* Lamprey, somehow

* Snaxi, castle

* Xoq, snowbox

* Synergy, all main maps done

* Some vaults

* All vaults done

* All working away missions done

* Adding turfs underneath these, touch up afterwards

* Waystation again

* Turfing rest too, also fix afterwards

* Waystation again (again)

* Bagels

* Snowmaps

* Meta and deff

* And finally, lamprey

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-10-06 16:42:55 -05:00
SonixApache
9e69421c9d glock magazine overlays (#30746)
* glock magazine overlays

* forgot to remove this thing i was trying

* don't need this either

* Apply suggestions from code review

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

* unnecessary line

Co-authored-by: DamianX <DamianX@users.noreply.github.com>
2021-09-21 20:11:14 -05:00
Exxion
14358832b0 Fixes magazines (#30813) 2021-09-20 11:27:03 +00:00
Shifty
7be042441a the meat of it 2021-09-18 14:25:35 +01:00
ShiftyRail
409ae193c2 The Postman always ring twice (#30551)
* Revert "Revert "Revert "Lights out tonight (trouble in the Heartland) (#30526)" (#30527)" (#30529)"

This reverts commit 5ae655387f.

* fixes urgent problems

* fixes the problem with zooming out

* gliding

* on the beach

* suffer not the lag

* fixes mesons and fire
2021-09-07 09:58:07 +01:00
Kurfursten
5ae655387f Revert "Revert "Lights out tonight (trouble in the Heartland) (#30526)" (#30527)" (#30529)
This reverts commit 2a0cec3fda.
2021-09-05 18:22:30 -04:00
ShiftyRail
2a0cec3fda Revert "Lights out tonight (trouble in the Heartland) (#30526)" (#30527)
This reverts commit eb21803691.
2021-09-05 17:14:55 -05:00
ShiftyRail
eb21803691 Lights out tonight (trouble in the Heartland) (#30526)
* Revert "spark machine (#30524)"

This reverts commit 7fc876a34d.

* Revert "This is why we can't have nice things (#30520)"

This reverts commit 6f7fbe95c1.

* Revert "Europa Lights 2021 - version 3 - wall shadows working edition (#30497)"

This reverts commit c03b442604.
2021-09-05 23:02:14 +01:00
ShiftyRail
c03b442604 Europa Lights 2021 - version 3 - wall shadows working edition (#30497)
* step1: compiles

* readds shadow atoms

* attempt at making spess dark

* planes fuckery

* forceMove fixes

* mouse opacity fixes

* moving to the europa light jargon

* rational brightness ranges

* re-adds moody lights

* sunglasses : compile check

* readds vampire vision

* No stacking of overlays, pt. 1/2

* makes wall shadows NOT ass

* toggle darkness

* compile

* sacrifice my firstborn to the linter gods

* test one

* uh

* europa lights mapping

* fireaxe cabinets

* Doing surgery on maps: deff

* removed herobrine

* map surgery: metaclub

* map surgery: synergy

* maps surgery, low fat bagel

* makes this compile

* more edge cases (haha)

* forgot these features

* blur: on

* wizzie den dark

* fixes the thunderdome
2021-09-05 13:54:34 -05:00
DamianX
fe77ef6e20 Converted all old events to lazy_events, removed old events, renamed lazy_event to event (#30503)
* wip refactor old events

* refactored events

* We're not lazy anymore! I mean we're still are. We just don't call ourselves that. Lazy is the new default option. It's also the only option. God, this took so long.
2021-09-04 23:21:03 -05:00
DeityLink
d7f1660ed2 Fixed Immovable Monolith being tilted. (#30466) 2021-09-01 18:03:33 -05:00
DeityLink
4a2e748e2a Fireaxe closets are no longer closets code wise, also [MDB IGNORE] I guess lol (#30433)
* Fireaxe closets are no longer closets code wise

* oh right

* aaand that too

* and all of those

* finishing blow
2021-09-01 11:28:20 -05:00
DeityLink
81901b3660 Rainbow Gun (#30331) 2021-08-27 08:08:45 -05:00
SECBATON GRIFFON
dada53f31c Suicide_act() update (#30086)
* Beginning suicide_act rework

* compile

* more acts

* compile

* compile

* compile

* compile

* better logic

* oh

* oh

* grammar

* TTVs now act like c4

* or now

* now for flares

* compile

* more general ones

* better

* even better

* generalises these too

* supermatter

* oversight

* circuit imprinters

* oversight

* tweaks

* tanks

* consistency

* oversight

* better chem dispenser one

* computers and gibbers

* oversights

* tweaks

* Fix

* processor

* NOOSINGS FINALLY PORTED FROM HIPPIE

* woops

* removing redundant code, consistency too

* more redundancy down

* this is better

* forgot one

* making nearby item checks more sane now

* better bomb one

* oversiiiight

* cuts down redundant function

* now for welderbomb suicide

* sanity

* more sanity

* switch looks nicer

* these too, obligatory

* oh right

* oh right

* hopefully these work right now

* updating for this one now

* species check

Co-authored-by: SECBATON GRIFFON <sage>
2021-08-24 20:48:18 -05:00
DeityLink
f69f4103e8 Fixed items slowing you down when worn on the back but not when wielded (#30285) 2021-08-23 19:45:48 -05:00
DamianX
4f195f4b6c Create the Judge Strike team (#30252) 2021-08-21 16:04:48 -05:00
Allspice
38b4273d44 Time agent (#28728)
* Add Time Agent role

* Add Time Ninja to antag prefs

* remove some randomness

* Remove parens

* pacify linter

* Spawn in an evil timeagent twin if they dawdle, start adding 'rearrange' jectie

* Time agent outfit datum

* chronocapture formatting

* Prevent runtimes if rewind rifle is dropped during send_to_past

* make time agent outfit special

* Add teleportitis and ion laws as timeline distortions

* Delete erase-from-timed mobs from in-game logs.

Specifically, PDA server, med/sec/whatever records, and
message server.

* remove merge conflict

* start adding time faction

* more faction changes

* whoops

* moved some jectie stuff into the faction

* adjust the time agent extract objective

now only one anomaly spawns in, even if a time agent twin is generated later.

* add decal to timevoid.dmm

* fix some bugs

* current untested changes

* remove duplicate proc, fix time agent pinpointer

* Add timeslip status effect for stage 1 time agent tardiness

* couple of time agent tardiness adjustments

* whoops

* whoops 2
2021-08-16 17:11:18 -05:00
DeityLink
840f4ad479 You can no longer aim guns at people using a cloak of cloaking (#30205) 2021-08-14 02:43:13 -05:00
kane-f
da528063d7 Refactors effect/effect into effect (#30138)
* Refactors /obj/effect/effect into /obj/effect

* Fixes these

* And these

* And these

* Fixes stuff not being clickable

* Fixes .dme real quick

* Removes now-redundant vars

* This too

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-08-11 15:19:06 -05:00