Commit Graph

69 Commits

Author SHA1 Message Date
DGamerL
db578cdc6f Makes food not a subtype of reagent holders (#23379)
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-21 19:00:02 +00:00
DGamerL
2dacfc02c2 I hate the experimentor (#22955) 2023-10-20 20:16:24 +01:00
AffectedArc07
3e49f1ef29 Strange object refactor (#22774) 2023-10-08 14:26:42 +01:00
Adrer
f1d6229777 Blacklists certain items from the experimentor. (#21368)
* Blacklists certain items from the experimentor.

* Remove unused variable

* Update code/modules/research/experimentor.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Revert "Update code/modules/research/experimentor.dm"

This reverts commit b666073133.

* Fix

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-06-21 23:12:27 +01:00
Ryan
7c3cd86f14 APC & Machinery Refactor + Local Powernets (#19991)
* local powernet and machine power refactor

* some fixes

* more tweaks + powerchange() refactor

* fixes var edited apcs on meatpackers.dmm

* fixes issue with power channels

* Reviews

* delta fix

* Update code/game/machinery/portable_turret.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* removed area power change proc

* damn morgues

* requested changes

* request changes

* deconfliction

* mapping fixes

* some fixes from TM

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-01-30 22:28:10 +00:00
warriorstar-orion
69c46888da Don't track Runtime or Ian in E.X.P.E.R.I-MENTOR state. (#19430)
* Don't track Runtime/Ian on E.X.P.E.R.I-MENTOR.

* snake case changed vars
2022-10-21 20:02:57 +02:00
S34N
edeba92326 Smoke spells readability (#19387)
* read the smoke

* oops

* contra

* contra

* more tidying

* last one

* Update code/modules/projectiles/projectile/magic.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-15 18:05:55 +02:00
Farie82
a7179d97bf Makes wormhole projector portals spawn effects once every 0.5 seconds max (#19398)
* Refactor the parameters and starting the teleport

* Adds arguments and moves the default effect generation up to do_teleport

* Typo in arguments

* portals now only create sparks every 0.5 second when things pass through

* Comment fix
2022-10-15 11:40:32 +01:00
Vi3trice
20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
S34N
dea37b11ce Medsci remap strikes back (#18468)
* 1

* 2

* 3

* 4

* 5

* the great tag purge of 2022

* job spawners, viro window deletion

* atmos pipe moment

* fixes

* removes maint can

* feedback

* converts spawners to the new system

* OR shuffle, and other things

* further edits

* le thingy

* miraviel review

* merge master 2

* denth review

* secondary thingies

* master update

* minor fixes

* feedback

* bmon review

* more tweaks

* area mistake

* things

* fixes departures

* deconflict

* unshocks your doors

* fridge fridge fridge

* OPTIMISE

* oops

* gnarg

* another one

* QC pass

* oops

* areas

* Update code/modules/research/rdconsole.dm

* more tweaks

* space sign space sign

* decals

* oh my life

* experimentor fixes part 2

* scope creep 2 scope creep 2

* de-gogglify

* restore chapel confession booth, fixes viro fridge

* more fixes

* lovely windows

* walls and pipes and pipes and walls

* bmon review

* bmon review

* excess access

* changes chapel maints, but not really
2022-08-11 15:46:49 +01:00
AffectedArc07
2f5cec832d Cleanup redundant machine stuff (#18494) 2022-07-27 21:25:39 +01:00
Sirryan2002
a2f89392cf Minor Code Cleanup + Adds Adjacency Check to Experimentor (#18355)
* polishes garbage

* :)
2022-07-13 18:15:57 +01:00
KalevTait
9850d3d840 research (#18300) 2022-07-10 14:02:05 +01:00
moxian
09e7f54a43 Convert most of /obj/machinery to use Initialize rather than New (#17845)
* Switch a bunch of /obj/machinery from /New to /Initialize

This is an easy and uncontroversial batch.
No globs, no late init, and stuff.

* Move more machinery to Initialize

This time the ones dealing with GLOB vars,
as well as some simpler ones i missed previously.

* More tricky New -> Initialize migrations

* The last of machinery Initialize conversion

* fixups

* Newscaster armor fix

* styling

* Comment on armor handling

* Move newscaster armor definition back to datum

* farie82 review

* kill extra .=

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

* farie's review part 2

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-06-29 08:33:52 +02:00
moxian
e7ced2a0c3 one more small pr fixing purple squares (#17808)
* Set valid initial state for some dynamically chosen icons.

* random tool icon

* strange object
2022-05-17 15:39:44 +01:00
Vi3trice
620a8d49a4 Fix Experimentor deconstruction, and standardizes into tool procs (#17593)
* Update experimentor.dm

* Should have been sane

* Forgot that
2022-04-12 15:52:01 +01:00
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
Fox McCloud
f65c8994ce Broad TG Sound Update (#15608)
* Broad TG Sound Update

* jester update
2021-02-27 11:59:33 +00:00
Fox McCloud
de795c4e31 Radiation Refactor (#15331)
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
2021-01-24 22:03:13 +00:00
Certhic
4926876119 scrapped reagants 2020-09-04 10:48:32 +02:00
Certhic
e0c6612e30 reverted an accidental change 2020-09-03 16:23:08 +02:00
Certhic
147cd00729 tweaks to experimentor bugfix 2020-09-03 16:18:09 +02:00
Certhic
42edb7ba75 fixed runtime in experimentor 2020-09-02 14:31:54 +02:00
Fox McCloud
75a8efa65c Updates Components (#13594)
* Updates Components

* signal documentation too

* minor fixes
2020-06-15 18:18:07 -06:00
Fox McCloud
70b46d8aea Life refactor (#13471)
* Life Refactor WIP

* part 2

* part 3

* runtime fix

* newlines

* tweaks

* perspective checks

* fixes

* remote view tweaks

* more fixes

* robot fixes

* better updating

* cleaned up icon procs

* less proc call overhead

* performance gains

* more optimization

* shorter lists, removal of unecesary code

* gene OOP and dna styling cleanup

* oops

* axe disabilities

* typeless loop

* various tweaks and fixes

* brain checks

* runtime fixes

* cryo vision fixes
2020-06-03 19:43:30 -06:00
Fox McCloud
306fdd6629 Merge pull request #12934 from farie82/Item-armor-fix
Make every obj/.../New() call it's parents, Fixes things not burning on lava and causing runtimes
2020-02-24 19:42:19 -05:00
Citinited
fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700)
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
2020-02-15 13:31:08 -07:00
joep van der velden
fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
Fox McCloud
0854f75f7b Fixes Pugs 2019-09-06 19:06:41 -04:00
Fox McCloud
a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
Fox McCloud
f01af6ae20 Implements Goon Smoke 2019-03-15 19:09:29 -04:00
datlo
8070b9f87a change real names of some strange objects 2018-11-22 12:38:27 +00:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
4306d27521 circuit imprinter update 2018-04-22 00:34:06 -04:00
Fox McCloud
32e3a25070 got it 2018-04-21 20:25:14 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown
a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Markolie
182cd3a0de Fix catwalk/plating issue, update Experimentor grammar and remove disabilities from nuke ops 2016-11-02 13:17:35 +01:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Fox-McCloud
25c01ef3ba Fixes up apply_damage 2016-07-22 21:03:17 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again
Major Gun Refactor
2016-06-08 22:49:10 -04:00
TheDZD
16f4b61520 Merge pull request #4613 from Fox-McCloud/experimentssss
Experimentor Duplication Limit
2016-06-08 11:15:18 -04:00
Fox-McCloud
bb02bfa284 Experimentor Duplication Limit 2016-06-07 02:25:06 -04:00