Commit Graph

1120 Commits

Author SHA1 Message Date
Henri215
e6b2339424 Another jani HUD runtime fix (#23569) 2023-12-15 18:33:25 -06:00
Henri215
b9fc8bc8b3 Fixes cleanables not garbage collecting properly (#23553) 2023-12-13 21:48:00 -06:00
DGamerL
962e78a363 Makes borgs take damage from being flung into objects (#23000)
* we are so back

* Makes it compile

* Vendors, walls, windows and consoles done

* Blob and living mobs

* Magpulses are now based on traits

* Gives borgs the trait by action button

* Fixes modsuits

* Update code/game/objects/objs.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/turfs/turf.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/living.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Fixes Thunk

* Actually fixes it

* I took an L (away from the trait)

* One proc now

* Update code/modules/clothing/shoes/magboots.dm

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

* Update code/modules/clothing/shoes/magboots.dm

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-12-13 15:22:02 +00:00
Henri215
94cefac7cb Adds jani HUDs from Baystation! (#22654)
* Adds jani HUDs from Baystation!

* wrong place

* tweak to sprite

* contra review and tmeporary tweaks to the sprite

* finishing the sprites

* tweak to icon alpha and nv sprite

* typo

* conflict part 2

* test

* final adjustments

* DgamerL review

* fixing sprites

* changing name

* name part 2

* DGamerL review part 2

* wrong value

* nope

* equipment and janitorial categories

* Apply suggestions from code review
2023-12-11 16:52:54 +00:00
Contrabang
c8dce33a8a Cleans up a lot of globals a few other vars (#23246)
* i hate globals i hate globals

* more fucking of these

* sirryan review
2023-12-06 15:30:41 +00:00
Cocacolagua
4b3a720d96 Removes boxes from the uplink PART 1 (#23189)
* removes boxes part 1

* shorter desc for nano injector

* yeahsure1

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* yeahsure2

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* yeahsure3

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* ok no more kit

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-24 15:33:25 +00:00
Octus
ba44b18102 Removes Barber because its a poorly designed role (#23053)
* solong

* test

* update

* fixififixx

* ok back to barbers

* spring cleaning

* i hate you safety scissors, genuinely

* space fix

* reviews

* Update sechud.dmi

* Update card.dmi
2023-11-21 13:10:13 +00:00
1080pCat
e2ffb8a882 Engineering borg nerf (just their decompiler ;p) (#23227)
* Engi borg nerf

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/fancy.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/fancy.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/food_and_drinks/drinks/drinks/bottle.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/friendly/lizard.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/projectiles/ammunition.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/chemical_bottle.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update lighters.dm

* Update spiders.dm

* reverts some that maybe should stay

* oops

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-11-14 12:51:13 +00:00
Contrabang
48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777)
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

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

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

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

* fuck

* bah

* Update tools/ci/check_grep2.py

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

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-12 20:59:43 +00:00
Adrer
400661b5cc Fixes overlay issues. (#23186)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-07 11:14:03 +01:00
Henri215
bc095ad398 Adds Whistles to the game (#22729)
* Porting whistle from CMSS13

* species variations

* lets kill the conflict

* adding it back

* new whistle sound
2023-11-06 15:51:45 +00:00
Venuska1117
d24f77400e Space Ruin: Rework Syndie Research Base (#22721)
* Rework Syndie Research Base

* Fixing

* Fixing..

* work you cu-

* SPAACE

* Pack of changes:
- Removed Toilets and replaced them with "Dressing" room.
- Added Genetics, because person on discord wished for it.
- Placed Atmos pipes (scrubbers and supply)

* Changes:
- Added Pathing for ed209 (syndicate)
- Removed random_spawners custom spawner made before.
- Added "security" room with allow you to control turrets and see all base cameras.

* Fixing turret control panel

* Fixing turrets.. again

* huh?

* Changes:
- Decreased Beacons amount from 20 to 10 (they give same path, just less stops).
- Added special room to "store" ed209 syndicate, if you want to activate it: View Variables -> patrol = 1.
- Added light switches everywhere.
- Added Air alarms and fire alarms everywhere, and made sure there are fire doors to stop potential fires.
- Added 2 more areas, Genetics and "control room".

* Placed Power Cables.

* Added disposals
Lets fuckign Gooooo

* Changes:
- Made button from drive actually open doors and shoot stuff to toxin range.
- Added emergency PACMAN generator, in case someone join late and whole base will be de-powered.
- Added CCTV to caves, now you can see intruders.

* Added 2 more boxes of plant disc.

* Changes:
- Added new variant of free drobes, now syndicate can get drip for free.
- Added "hidden" safe at vault with contain 10000credits and stethoscope nearby to help, its only for syndicate researcher, if explorer steal it, they should get bounty on them by syndicate.
- Added a lot of vendors refilling units, to make sure that you cannot run out by "accident".

* Changed Toxin Test arena to indestructable walls.

* Bunch of Changes:
- Replaced "grenade casings" (with are foam grenades) with new created "Foam Grenades Box" so its more oblivious what it is.
- Added paper note near PACMAN Generator with contain basic instruction how to use it.
- Added missing fire doors for "drooms".
- Added fire extinguishers EVERYWHERE so syndicate OSHA will be happy.
- Changed "genetics" room, now instead of supporing 4 people, it support now only 2 in exchange for "faster" DNA researching.
- Added "Foam Grenades Box" around base and in storage, so if there any breaches just throw kanu- grenades at them.
- Named and connected disposal to "toxin launcher" so now you can disposal your constractions inside.
- Added 4 buttons for "Chemical" testing room (with is not for explosives) so now you cannot get trapped inside.
- Made special disposal Ride for genetics "monkeys" to turret so they will be killed (its made this way to avoid researchers spacing themselfs allowing them to escape)
- Increased Toxin Storage room, by increasing oxygen and plasma tanks amount by tanks 2 each.
- Moved AIR container to engine, now they are replaced with "tank container" to storage... custom plasma mixes without destroying main plasma containers.

* fixes

* Changed Genetics:
- Now genetics layout got changed, now instead of supporting 4 genetics people it only support 2 in exchange for more efficency in making DNA syringes.
- Now you can dispose bodies for turrets to shoot holes trough... its funny.

* Added Mirrors to dressing room-
And Fixed hallway curve

* Made cryo and sleepers face themselfs

* Added RPD for toxin launcher room
- now if you run out of valves, you can just "spawn" new ones.

* Used merge conflict fixing tool
- and for *some* reason it keep showing merge conflict? (whot)

* Requested changes:
- Replaced NT machine with syndie cigarette machine.
- Removed random blueshield note.
- replaced syndie donk machines to secured variant.

* Changes full build consoles to unbuild.

* Fixes:
- Fixed storage, somehow one rack with mats got exaporated.
- Added tachyon-doppler array for tracking explosion size.
- Removed duplicated buttons from toxin mixing room.
- Removed console and placed in storage.
- Storage now have items with offsets so they are more visible in stack pile.
- Removed Air alarm from toxing testing arena, considering it dont have pipes.

* Add RPD in toxing mixing

* batch of fixes (?)
- Changed Art vendor and critter care to free variant.
- Fixed spelling on paper to requested one.
- Now syndicate researchers spawn with 100 credits in their backpack for claw machine, if you run out, ask your coworkers to borrow more cash on game.

* batch of changes:
- Did most requested changes by S34N (except defib one)
- Added APC to hallway, so now hallway use power too.
- Made new subtype of syndicate APC's with offset depending on direction.

* fix stripes issue

* Removed random stripes and syndie having cash
2023-11-04 11:31:41 +00:00
Qwertytoforty
357c62b6d7 Ports hitscan from TG, adds it to *SELECT* things (#22754)
* this was just going to be a plasma cutter change but no had to make it look good, whats next, ai sat turrets (yes)

* ai turret

* Coca cola, don't forget the ice. Or the pulse

* almost done, pull master than map edit

* we ball

* ah, chasms.

* it's for the best. Fuck should not sleep checker though

* hitscan reflection limiting system

* Apply suggestions from code review

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

* c-c-c-changes

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-11-01 20:05:27 +00:00
Luc
95d3a49929 Ports Malf AI rolling (and some other tipping refactors) (#21900)
* some thoughts

* I really forgot to commit all of this didn't I

* Rework vendor crits

* fixes some angle jank

* yeag

* Patches up most bugs with tilting things over

* Fixes up most of the AI logic

* rolling AI can now take teleporters, visual effect is now only seen by the AI

* better effects

* Remove a bunch of now useless code

* I keep forgetting this

* cleanup in aisle seven

* oops

* some more testing

* adminbus hours

* Fixes some buildmode stuff, does some more testing

* Add documentation

* Demo bugs

* Apply suggestions from code review

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

* rework crit damage amount

* Adapt recent tg changes

* Fix some small bugs in testing, contra review 1

* contra review 2

* Fixes tipping with pacifism

* restore removed icons

* Fix some remote untipping

* restore the roll action

* finally address contra's review (sorry)

* remove debug tool

* Move untilt logic into component

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-31 20:24:52 +00:00
matttheficus
7e7f03c906 Elite Tactical Magboots (#22968)
* here we go

* notes

* sprites

* this is needed

* some tweaks to gear

* nit

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* fix this

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-10-31 18:35:05 +00:00
S34N
49b0071400 Repaths some decals, makes copyTurf copy decals (#22528)
* why do I do this to myself

* pass 2

* maps

* delete this

* PR number obtained

* Revert "maps"

This reverts commit 87926f4a0c.

* maps
2023-10-30 20:15:14 +01:00
Qwertytoforty
3dc52b9f1f Reworks some trader pools. (#22969)
* oh boy let us have some heads roll

* le comma au chocolate

* perhaps we we want them to be able to build it

* mmm ice cream sandwich cereal

* Update code/game/objects/items/weapons/storage/boxes.dm

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

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* lablled

* Apply suggestions from code review

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

* solcase

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-10-29 10:18:35 +00:00
Mitchs98
e8ab249eda First Course; Soups, Salads, Sandwiches! Splits food.dmi in preparation for future PRs. (#22866)
* ORDER UP

* whoops

* slimes ur jelly sammich

* whoops 2

* prettier pretty patties

* whoops 3

* the splittening

* Henri review

* contra review + repathening

* salad bowl

* contra review 3.0

* renamed plain burger to burger, clarified need for abstract item

* DG Review
2023-10-28 21:28:56 +02:00
Qwertytoforty
7db1d5b63d Bluespace vetus doesn't spark from it's anomalies (#23001)
* hardmode vetus now puts out less sparks than the fourth of july

* Update code/datums/helper_datums/teleport.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-10-26 10:41:22 +01:00
Vi3trice
85353104f7 text be gone (#22929) 2023-10-26 10:39:11 +01:00
DGamerL
840161bc67 Makes meteors not take damage from railings (#22909)
* One simple istype killing many Farragi

* Qwerty Suggestion
2023-10-22 12:07:21 -04:00
Henri215
24cd97808e Fixes the black suit jacket from vendors and from uplink (#22807) 2023-10-13 14:24:39 +01:00
Qwertytoforty
64456806a5 [READY FOR REVIEW] I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna. (#22016)
* hard mode stuff

* further progress

* more progress

* pausing work to fix bug

* lets pr this mess

* more progress saving as vacation soon

* sleep_check_qdel

* saving work

* medals into deconflicting

* icons

* Fix compilings, medals

* Apply suggestions from code review

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

* yes

* Apply suggestions from code review

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

* earliest of the returns

* icons

* Apply suggestions from code review

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

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

* ah lateload, my beloved and hated with no debug points

* todoops

* requested changes

* move medals / move comment

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-09 21:45:41 +01:00
Henri215
a5783c7169 Adds new microtransaction method: Scratch Cards! (#22618)
* scratch cards!

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* tweaking values

* maint loot tweak and to_chat

* sprites

* DGamerL review

* adjusting volume

* better like this

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-10-09 20:36:24 +01:00
GDN
6df2c2e3d2 Ghost bar (#22368)
* Ghost bar initial changes

* more changes

* we ball again brothers

* we are (once again) SO back

* Update code/modules/admin/verbs/debug.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/_onclick/hud/alert.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/_onclick/hud/alert.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/game/objects/items/weapons/cards_ids.dm

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

* deck of cards and shittt

* global placement

* Update code/modules/ruins/ghost_bar.dm

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

* readded

* hotfix

* zamn

* fixes

* greyfix

* last of the fixes

* can't stop me baby

* bam

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-09 19:47:17 +01:00
Git-GoR
d31012330b The degrilling: map windows no longer have grilles under them unless electrified or space adjacent (#22273)
* Existing window spawners are not grilled
Adds new grilled versions of window spawners
Spawner icons modified accordingly, new non-grilled ones

* initial commit of map changes

* include all subtype (yellow etc) cables

* Re-grills cyberiad's space adjacent windows

* Re-grills delta's space adjacent windows

* Re-grills meta's space adjacent windows

* Re-grills cere's space adjacent windows

* Regrills all spacefaring windows in SpaceRuin maps

* Fix duplicated window spawners in main stations

* Fix bad delta windows

* Fix wrong meta windows, regrill QM office

* Fix couple of wrong windows in Cere

* Fix several cyberiad windows

* Adress review of missing windows in cere and delta

* Fix missing window in delta next to turbine

---------

Co-authored-by: Warriorstar Orion <orion@snowfrost.garden>
2023-10-05 19:35:46 +01:00
Sadhorizon
dfd13270e9 Adds a new fauna to lavaland: an abandoned minebot! (#22173)
* added the file

* works pretty nicely

* forgot these comments

* doubled their spawn chance

* minebot passthrough stuff

* more fluff

* no longer will go to lava tiles

* answered most reviews

* DGL's solution

* makes loot more efficient, minor tweaks
big thanks to DGamer with this one!

* DGL's review

* Update code/modules/mob/living/simple_animal/hostile/mining/abandoned_minebot.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Merge remote-tracking branch 'upstream/master' into outpost_remap_copy

* oops, a lil fuckup

* removes an unneeded var

* removed the landmark iconstate

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-10-01 12:12:11 +01:00
DGamerL
d4a72d4835 Yes (#22495) 2023-09-23 19:39:29 -05:00
Sadhorizon
527fb7e5c2 gut lunch time! (#22285) 2023-09-17 20:18:34 -04:00
JimKil3
5450f598bf Adds the holo-cigar, a human-specific traitor item (#22062)
* badass trait

* the cigar

* sprites ft. mcramon

* makes it obtainable

* Apply suggestions from code review

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

* contra review

* Update code/modules/reagents/chemistry/reagents/medicine.dm

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

* Update code/game/objects/items/weapons/cigs.dm

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

* henri review

* contra broke everything

* contra broke everything pt 2

* Update code/modules/clothing/glasses/glasses.dm

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

* Update code/game/objects/items/weapons/cigs.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* lewc review

* update_icon_state

* Apply suggestions from code review

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

* Update code/game/objects/items/weapons/cigs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* are you happy now dgamer

* henri review 2

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-12 17:10:23 -04:00
JimKil3
aaad2a5aba Adds the Oblivion Enforcer wizard loadout (#21920)
* initial addition

* adds wall/airlock obliteration
this definitely needs to be tuned a bit numbers-wise

* adds TRAIT_SUPERMATTER_IMMUNE & gloves

* adds more checks for the supermatter immune trait

* removes SM tongs logic from the halberd
Realistically, you would never actually have the halberd and tongs

* makes slivers bulky

* dusting downed people
also removing a useless assigned variable i missed

* adds the (incomplete) loadout

* halberd buff

* adds robes + sprites

* oops

* halberd icons

* knockdown

* stuff

* timer shortening

* species sprites part 2

* animation for dusting walls

* Apply suggestions from code review

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

* early return

* parry numbers!

* Update code/modules/power/engines/supermatter/supermatter.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* dgamer review

* dgamer review + no more pulling

* reverts early return thingamajig

* Update code/modules/power/engines/supermatter/supermatter.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* removes `get_turf`

* hal review pt 1

* hal review pt. 2

* Update code/game/objects/items/theft_items.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* `carve_sliver` proc

* unfucks icons

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-09-10 22:15:12 +01:00
GDN
d540f421f4 Prevents blood from attempting to dry if said blood no longer exists (#22174) 2023-09-07 11:06:40 +01:00
Adrer
9ce4886bc6 Fixes check for gravity generators on Z-level (#22239)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-06 19:59:22 +02:00
JimKil3
e29dab21f0 Buffs cryogenic anomalies (#22002)
* cryogenic anomaly buff

* setus vpeculator
2023-09-01 23:07:31 +01:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

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

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
SchrodingersWolf
86a8690907 Added the Armored Suit Jacket to both the Uplink and as maint loot (#22011)
* Added the armored suit jacket from the Agent 47,
Bond and Professional Bundle to the Uplink. Also
allowed it to be spawned as maint loot.

* Messed with main loot drop values

* Telecrystals son, they increase when exposed to inflationary pressure

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-08-28 13:15:33 +01:00
SchrodingersWolf
b820ced744 Removes unused slime jelly bloodcrawl interaction (#22022)
* Removes unused slimeblood bloodcrawl interaction

* Removed cult blood magic checks as well
2023-08-25 16:58:28 +01:00
Luc
b5613d239d Adds a new Fungal Growth event, makes fungus re-harvestable (#21928)
* the fungus is amongus

* us -> al

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

fineeee

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

---------

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2023-08-21 20:02:27 +01:00
Qwertytoforty
76a845d380 Modsuits. Ready for review, sorry for the ammount of files changed 👉 👈 (#21147)
* biting off more than I can chew, but I feel like hurting myself

* more shit

* progress continues, moral stays sameish

* bite of 2587

* mod_theme down, but probably broken

* 385 errors, 16 warnings, zero tgui interactions

* 292 19

* final strech to buggy mess, break time

* it compiles. It almost fucking certainly doesnt work, but it compiles

* fudhsciffubgsbgpgb actions not working as should for modules

* fuck it we'll just open the pr as we work on it

* icons work now

* tgui stuff

* more progress

* JUDGEMENT

* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.

* jetpacks, gps, and go do what exo-suits yourself

* almost ready

* sorry to whoever has to review this

* should work™️

* should be good now

* pushing changes so I can do reviews next

* Apply suggestions from code review

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

* lore™️ Adds illegals level to modsuit parts from syndicate.

* early returns

* and these illegals

* no uplink reference idiot

* mod inhands are a good idea

* this is needed for inhands nerd

* Bomb detector working, modsutis cover ears. skin things

* overslotting removal, cyborg charging, ert loadout for gamma

* duplicated signal

* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.

* tether module, orb module, holster stuff

* built in no slip, cheaper 87

* removes modules already installed, engineer ert get jetpack, equip into modsuit storage

* comments spaces and duplicate flags

* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Compile TGUI, slowdown adjustment, Modsuit to MODsuit

* sonar, do after, more equipment, acid handling

* overlay bugs / ERT / DS suits autodeploy

* middle click action buttons

* traders, sec modsuit energy nerf

* surplus weighting

* Kinesis module.

* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis

* more power / unused module removed

* name, ds fix, pre equipped to cc suit

* depot / grammer

* ok should be good™️

* overslot, dupe gun, missing suit storage

* stealth nerf, new kit

* gun stuff  / ds theme

* bio armor is gone

* let me push changes please thank you

* makes shocks work right

* copies over some changes TG made to module prices after porting

* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-

* sirryans changes

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

* Update code/modules/telesci/gps.dm

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

* Update code/modules/telesci/gps.dm

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

* Control define, ERT / DS have gloves / boots again.

* Apply suggestions from code review

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

* More changes

* god I hate tgui. Why do all the bundles live underground, instead of in my basement?

* she updates my master till I testmerge

* modsuits can recharge again

* fixes a lot of shit

* Ready for TM probably

* sure fuck it whatever that makes sense I guess

* the pinpointer works better™️

* Another storage module bug fix

* hair and medical stuff

* fuck fuck fuck

* fixes sonar

* Bag exploit fixes / plasma runtimes / ear nerf

* dna lock improvement / cryostorage

* whoops

* Ball form second cooldown wasn't helping, no more infinite cores

* she springs my lock till I ***SNAP***

* plasmaman no longer die

* fixes modsuit emp issues

* atmos no longer fucking dies

* Fixes, module printing, and a restriction on newly constructed modsuits

* Inventory code my hated

* WOOO PREFERENCE CODE WOOOOO

* icons my hated

* fix for mods / spaceproof shit

* holy shit whhhyyyyy

* backpack first

* Update mod_theme.dm

* prevent infinite gun arms / infinite modsuit cores / syndicate modules

* fixes tm error

* scream loudly if species sprites break. They shouldn't, but, you know.

* deconflicted with luck

* converts to refit for species

* fix pathfinder

* fixes modsuits being funky power wise

* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit

* nerfs the atmos modsuit

* magboots for ds / CC modsuit

* downside of autosave: typing in wrong window saves bad stuff

* Gamma ERT have internal cameras again.

* spellcheck when

* ah fuck

* yes delete the null that works

* whoops

* fixes error / description

* un vulps your cannon

* fixes tails disapeering on base modsuits

* space to underscore

* tgui fix / tajaran

* springlock buff, cryopod fix

* u helps

* WHO PUTS A GUN IN ITEMS

* tgui moment

* mining modsuit nerf / hidden holster module

* PAIN

* UNATHI TIDE STATION WIDE

* I love special code

* slightly dense

* shark jumpscare

* fixes ghost item, fixes springlock being bad

* YIPPEEEE IT WORKED

* she decons my flict

* pain

* ebbas days are numbered :^)

* hidden

* r-r-r-ebuild

* fixes more bugs

* qwerty, you are dense

* fixes gps

* fix mulebot crate

* level fix

* adds back icon

* moving storage, fix bug, modules activate / deactivate message

* yeah

* yeah

* yeah™️

* steels requests

* windoors no longer make pathfinder module explode

* chat spam

* oil slicks + modsuits

* whoops

* bag check

* ofc

* Update code/modules/mod/mod_control.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>

* Update code/datums/uplink_items/uplink_nuclear.dm

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

* Update code/modules/mod/mod_control.dm

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

* Update code/modules/mod/modules/module_pathfinder.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-08-19 15:36:13 -05:00
DGamerL
c2f9228988 [s] Fixes several clingspider related runtimes and fixes spiderlings growing into infestation spiders (#21988)
* The fixes

* Steelslayer review
2023-08-14 20:52:15 -05:00
Qwertytoforty
823ca7570a cryo vetus slip nerf (#21865) 2023-08-12 18:24:50 +01:00
Bjamcham
c874e8d1d9 The automatic Cryo storage Portal will no longer spark on use (#21739)
* New cryo portal subtype

* A better way to do it

* Update code/game/objects/effects/portals.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-07-24 15:45:58 +01:00
matttheficus
eeca206ccf Removes Green Giant Spider from Gold Slime Cores (#21615)
* begone dchat and admin spam

* sirryan review
2023-07-24 15:16:00 +01:00
JimKil3
bcea9d3377 Cryogenic anomalies & armor (#21603)
* cryogenic anomaly

* sprite

* reactive gelidic armor

* america number 1 raaah

* sprite (thanks atp)

* qwerty suggestion

* floor freezing

* Update code/game/objects/effects/anomalies.dm

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

* steel review commit 2

* whitespace apparently? idk

* whitespace fix (real)

* vetus

* Update code/game/objects/effects/anomalies.dm

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

* Update code/game/objects/effects/anomalies.dm

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

* Update code/game/objects/effects/anomalies.dm

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

* Update code/modules/clothing/suits/armor_suits.dm

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

* Update code/modules/clothing/suits/armor_suits.dm

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* early return thing

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-07-24 15:11:21 +01:00
Qwertytoforty
f58219a6f0 Makes anomalies deadlier. Again. (#21525)
* Makes anomalies deadlier. Again.

* Update code/game/objects/effects/anomalies.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

---------

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2023-07-24 15:03:17 +01:00
Qwertytoforty
55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769)
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
2023-07-21 15:56:00 +01:00
Venuska1117
012e2c3052 Cerestation: Making Farragus Dirty (#21494)
* Making farragus dirty
- Now maintenances are dirty, and doors leading to them have chance to have dirt near them.

* test

* Changes:
- Remove "rare" dirt spawner.
- Add "maybe" and "often" dirt spawner.
- Fix "often" and "maybe" oil spawners sharing same path [...]/maybe, now they have their own paths.

* Fixing
-It now actually have changes stated before, for some reason it didn't save.

* Fixes Delta:
- Change 2 "rare" dirt spawners to "maybe" spawners, with remove issue.
2023-07-19 15:53:26 +01:00
AffectedArc07
8d7e066471 Adds OpenDream as a CI lint (#21099)
* Initial Commit

* Makes the CI work (maybe)

* Of course CI has a hissy fit

* Actually fixes the codebase

* Oops 1

* Tweaks

* oops
2023-07-18 20:50:31 -05:00
Qwertytoforty
07889171bb Makes meteor events more consistant, with major meteors being more deadly. (#21459)
* what do you mean a weight of 75

* yeah do this
2023-07-17 10:50:33 +01:00
Nathan Winters
36b2aa1faf Fixes a couple issues with random costume spawners (#21711)
* Fix random costume landmark sometimes spawning nothing

* Remove random egg from chicken costume landmark
2023-07-17 10:48:55 +01:00