Commit Graph

1042 Commits

Author SHA1 Message Date
Aylong
58e88eeec3 Tweak: Removes position randomization for some things (#22820)
* Tweak: Removes position randomization for some things

* Randomize when create in machines

* Review changes
2023-10-13 14:26:27 +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
ZERO-XZB
6f76740f9e Creates research costs for some PKA mods (#22748)
* req_tech test

* add req_tech to some PKA mods

* var/requires_whitelist test

* forget a newline

* how do I newline

* remove research reqs

* conform to new /// comment style

---------

Co-authored-by: ZERO-XZB <temp@temp.com>
2023-10-09 20:46:11 +01:00
Vi3trice
1bad99aa5e Naughty unbuckling (#22725) 2023-10-09 20:43:29 +01:00
Contrabang
f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297)
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
2023-10-03 18:27:51 +01:00
Vi3trice
33c9a2b7ce Shelters sound like mining now (#22693) 2023-10-03 17:51:16 +01:00
McRamon
f0fa4e1fd8 H.E.C.C. suit resprite (#22643)
* Update vampire_powers.dm

* Revert "Update vampire_powers.dm"

This reverts commit 53a0596374.

* NanoMap Auto-Update (Mon Oct  5 06:34:42 UTC 2020)

* sprite

* steam-begone

* fixes

* fix2

* fix3

* fixesN

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

* NanoMap Auto-Update (Sat Jan 21 01:38:50 UTC 2023)

* Update paradise.dme

* Update paradise.dme

* removes_shit

* sprites

* all species

* some gigachad coding skills

* welp

* yeah i suck

* i forgot item icons

* Update code/modules/mining/equipment/explorer_gear.dm

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

* a fix?

* okaaaaay

* ha-haa

---------

Co-authored-by: NanoMap Generation <action@github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-03 17:42:20 +01:00
Qwertytoforty
fe90da76cf Adds jaunter kit (#22496) 2023-10-03 17:09:28 +01:00
Contrabang
7e0aa47311 Refactors objectives, expands team functionality, and custom teams (#22374)
* step 1

* renaming 1

* how could I forget this

* renaming 2

* renaming 3

* add matching proc, even if unused can remove later

* rename team obj to match

* oops

* okay more stuff

* okay more stuff

* fix this stuff

* okay more stuff

* needs_target = FALSE

* OKAY MORE STUFF

* OOPS AGAIN.

* self-review

* more round_end stuff

* stuff 119

* yeah fix that too

* EVEN MORE CHANGES

* grammar

* fix

* s34n review

* fixes custom teams with no antags not showing objs

* makes objectives work properly with teams

* a
2023-10-01 14:14:10 +01:00
DGamerL
4c976a6e01 Splits up item_inhands.dmi (#22584)
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes jackhammer and glass shard

* Fixes toy Chainsaw

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

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

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

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

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

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

* Fixes edagger hopefully

* Henri review

* Oops

* First this gone, and now the pain

* Should all be fixed now

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-01 11:47:25 +01:00
BiancaWilkson
bee378f52a Fixes some typos (#22583)
* list time

* just for you qwerty
2023-09-30 08:36:54 -04:00
Marm
ecfaa26cc2 You've Got Mail! Adds Mail system (#22269)
* heres the mail it never fails

Adds envelopes and its functions.

* It makes me want to wag my tail

Adds new envelope sprites courtesy of McRamon, makes mail bags and envelopess able to be carried by cargo clothing.

* when it comes i want to whail

Makes Wizard and Nukie equip change to off station role. Adds mail crates and functionality/logging for randomly choosing recipients of mail.

* MAAAAAAAAAAAAAAIIIL!!!!

Adds functionality for the mail scanner alongside sounds. Begins the process of making mail arrive on the shuttle.

* MAIL

* THE MAILMAN IS HERE

* MAIL IS REAL

* Give me an M, give me an A, give me an I, give me an L. What does that spell? MAIL.

Finalises pre-review mail features, adding the mail scanner to cargo tech loadout/autolathe.

* Update code/game/gamemodes/nuclear/nuclear.dm

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

* Update code/modules/shuttle/supply.dm

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

* Update code/game/jobs/job/support.dm

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

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

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

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

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

* Update code/game/objects/structures/crates_lockers/crates.dm

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

* Update code/controllers/subsystem/SSeconomy.dm

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

* check out what you got now

Removes unused sprite bloat.

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

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

* First few Contra reviews

* Second batch

* Cl doesn't fail anymore

* Even more fucking reviews

* Doesn't quite work yet but we're almost there

* WHEN DOES IT EEEEEND

* I have no energy to make a blues clues reference

More commits to respond to reviews

* God I miss Steve

Adds hand sprites to mail scanners

* Woooo Mail works again

* Science envelopes

* Update code/game/objects/mail.dm

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

* my god it worked

II hate it

* Bread and Circuses

splits up service envelopes into two categories, addresses other reviews.

* Lewc review - needs testing

* Almost there

Changing lists and more.

* Last fix

* IT IS ALL WORKING NOW

* Mail. Is. Done.
Final pass.

* Update code/controllers/subsystem/SSeconomy.dm

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

* Update code/game/objects/mail.dm

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

* The fix

* Just this one too

* Lewc review

* mail?

yeah

* Begone, ye powersink

* Sirryan review

* Update code/__DEFINES/economy_defines.dm

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

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

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

* Update code/controllers/subsystem/SSeconomy.dm

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

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

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

* Wjpp[s

* Removes useless comment

* We ball

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-19 19:30:03 -04:00
Henri215
9fdf2992be Ports Rod of Asclepius in hand sprites and moves staves in hands into a new file (#22250)
* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file

* removing for now

* its conflict time

* lets fix this conflict

* ah shit

* here we go again
2023-09-19 18:58:11 +01:00
DGamerL
3de8e63c6c Generalizes the chemical blacklist, refactors some other chemical lists and cleans up some related code (#21810)
* almost done

* HELP, SCOPE KEEPS INCREASING

* if this isn't the last thing, blame my sleepy me

* fucking foam all my homies hate foam

* remove the extra whitespace

* ghhh this needs testing + revert old shit

* first sleeper steps

* okay now to revert some changes

* oops forgot this

* more fixes

* iv bags can't dupe shit anymore too

* removes coniine from the list because why not

* removes life and histamine

* this should pass Cl

* stop runtiming me for unexisting chemicals

* adds ???? instead + god I hope this passes Cl

* attempt #2 to fix Cl

* Cl still fails but no solution now - static lists

* One fucking day Cl will not fail + complete remove

* I am going insane

* I am praying to several gods

* I'm getting desparate

* whoops that's my bad

* whoopsie number 2

* oops space indentation

* one rubber ducky later

* attempt number I am in a psych ward

* CODING CHAT MY BELOVED

* last things

* foam is also not a chemical

* now it shouldn't remake the list every time

* Henri review

* Adds saturated activated charcoal

* Charlie review
2023-09-13 10:42:17 +01:00
matttheficus
072a958398 Total Mining Points on ID/Ore Redemption Machine (#22143)
* it begins

* Revert "it begins"

This reverts commit 02f90f4ce9.

* oopsies, restart

* here we go again

* oopsie again

* god i finally figured out TGUI

* henri review

* tgui update

* Update tgui.bundle.js

* tgui

* Update tgui.bundle.js
2023-09-10 19:07:30 -05:00
Sadhorizon
1eabd98bfa Miners can redeem their voucher on a new option now: a basic plasma cutter! (#22153)
* new mining kit!

* added a shelter to the kit

* NOW properly deconflicted
2023-09-07 10:56:08 +01:00
Burzah
67901058ae Unum! The card game. (#22152)
* UNUM!

* distributing unum

* merch vendor

* Apply suggestions from code review

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

* color

* dmi update

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-01 23:18:37 +01:00
Qwertytoforty
8803f536b7 [READY FOR REVIEW] Lava land generation overhaul / variety (#21838)
* she lavas on my land till I chasm?

* need this

* whoops

* qwerty you are a dumbass

* now with 12 more maps per map

* repaths mesons, advanced mesons / meson implants show chasms

* more stuff

* range not radius dipshit

* sprites yipee

* define it

* undo mesons

* removes things I missed

* Apply suggestions from code review

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

* I'm lavaing it

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-01 22:40:39 +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
GDN
181b9e5c02 removes the refresher crystal (#21869) 2023-09-01 21:48:20 +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
GDN
ac5901be6a lavaland sliding puzzles now spawn normal mining chests (#21930) 2023-08-16 20:40:18 +01:00
Qwertytoforty
4748736c9e Ports TG staff of storms / updates sprites (#21566)
* Ports TG staff of storms / updates sprites

* I *said* it *doesn't* work in SPACE!

* Update legion_loot.dm

* requested changes

* icons fixed
2023-08-12 18:20:57 +01:00
larentoun
becc10c50d [FIX] Mining Vendor now spits ID on power_off (#21658)
* fix: Miner Vendor now spits ID on power_off
https://github.com/ss220-space/Paradise/pull/1317

* review fixes

* oops missed that

* Update code/modules/mining/machine_vending.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-07-23 23:29:58 +01:00
S34N
1459795807 Removes a redundant var from a few machines (#21424)
* changes to vars

* map edits

* Empty commit

* Update code/modules/mining/machine_processing.dm

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

* Update code/modules/mining/machine_processing.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>

* le changes

* error

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2023-07-20 12:58:01 -05: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
larentoun
ef35a172ee fix: upgrades parts now effect ore_redemption machine (#21650) 2023-07-13 13:56:24 -05:00
cybercapitalism
c7f57e04e4 fix heck helmet typo (#21342) 2023-06-21 22:56:10 +01:00
AffectedArc07
48b0210064 [READY] Widescreen (#20861)
* TM Needed - Widescreen

* A lot of fixes

* TM notice

* Feedback thread

* Minor tweaks

* Expans silicon view stuff

* Fix viewmods

* The preferential option

* Why were these global

* Fix clickcatch sizing, fix parallax issues

* Maybe fixes the runtime

* READY
2023-06-07 21:09:16 +01:00
DGamerL
173bfb92f5 Removes bio resist from the code (#21108)
* BIO armor is kill

* some more stuff that uses bio resist

* I did a scuffed merge conflict solve but it works
2023-06-03 09:50:22 +01:00
Qwertytoforty
8e6ed2f284 [serious april pr pls no close] Adds the magic nanny bag. (#20774)
* IT'S NOT A GRANNY BAG

* other tweaks to put out

* Restricted on raging

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

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

* defined

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

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

* changes requested

* no slime coring the super food

* actually let the pie live, the meds can be found in pill bottles in space, just not the steak

* merge conflict bullshit

* pain, suffering even

* icon handling

* M-M-M-ERGE CONFLICTS MY BELOVED

* Apply suggestions from code review

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

* s34n comments

* I can read and speak the english language™️

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-06-02 15:49:26 -05:00
GDN
c0cb7fdc9a Fixes a survival pod runtime (#20941) 2023-05-02 21:59:13 +02:00
Henri215
6826d2ba7b Moving some in hand icons to different files (#20748)
* Moving some icons out of left/righthand.dmi

* Moving sheets and ores
2023-04-25 21:13:02 +02:00
BiancaWilkson
c394c12e80 shuvel (#20825) 2023-04-14 20:18:58 +01:00
Luc
6bf5172bec Fix SM (and some other) follow links (#20554)
* hoopefully fix SM message tracking being really weird

* update some more follow targets

* Apply suggestions from code review

hehe

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

* Cleans up some loose ends, implements for arrivals announcer too

* Changes target to the new deactivated core

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-03-26 12:17:37 +01:00
S34N
5ce5a66c81 Ports a load of Pigeonverde322 sprites from beestation (#20588)
* initial

* second

* MORE

* spelling

* more spelling, rods

* qwik mafs
2023-03-26 12:11:01 +01:00
GDN
89a48529c1 makes crusher+accelerator upgrades gc and fixes a ghost upgrade issue (#20495) 2023-03-13 22:17:23 +00:00
GDN
3302f8bb96 Helper crystal is now a point of interest (#20516)
* Helper crystal is now a point of interest

* Update code/modules/mining/lavaland/loot/colossus_loot.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-13 22:36:54 +01:00
GDN
a91dd0fffb fixes a lightgeist runtime + possible qdel loop (#20444)
* fixes a lightgeist runtime

* wait don't need to call parent here
2023-03-04 09:21:34 +01:00
matttheficus
35476ab2c2 Allows the Kinetic Crusher to Parry Melee Attacks + BDM Trophy Tweaks (#20170)
* Parry this you filthy casual

* BDM offset
2023-01-31 22:07:12 -06: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
Qwertytoforty
b5700cab3e Fixes rng block chance not working (#20255)
* fixes rng block chance not working

* Update code/__DEFINES/flags.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-28 09:26:11 +01:00
Qwertytoforty
aec7c3ff3f Reworking eyes of god to be risk / reward / from colossus (#20163)
* eye see what is happening here

* loot it and ship it

* more progress

* more progress

* eye see

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>

* removing extra comment to rerun checks while I think on sprite

* name / sprite, good to go™️

* BSH no longer spawns invisible penguins

* oops wrong branch

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-20 19:28:22 -05:00
S34N
802408a923 Cere-station [100% free lag edition] (#19951)
* change da world

* compile, thanks

* Update cere.dmm

* Update cere.dmm

* ready for test

* use the proper name please

its CERE not ceres.

* stops shuttle from forcibly docking with podbay

* things are now different

Landmark update for job spawns.
More hardsuits in EVA, engi, and atmos.
Disaster counters properly added.
Vault is now more spooky.
Gamma armoury moved to below gulag shuttle.
Sleeping rooms replaced with arcade and swimming pool.
Captains ERP nest deleted.
Tcomms now looks like it was designed by a functional human being.
Mining doesn't need a weird glass box.
Shuffled docking ports at arrivals.
Windows are now reinforced windows.
Mr changs has arrived.

* disposals functions now

* now with 50% more air

* gamma armoury doesn't attempt to become one with gulag shuttle

* disposals net is airless, vault is enclosed in some rock

* standard number of escape pods

* slight fixes

* more bugfixes

* lighting fixes

* divided hallways, added psych office, more cams

* fire alarms, shutters, and fixes

* temporary DME edit to set cere as default map

* fixed shuttle runtime

* this compiles and runs locally, please CI

* fixes hidden double pipe

* more double pipes

* more vents and scrubbers, morgue body delivery

* tweaks to secbot pathing

* various QoL changes

* Medbay expansion, med+arrival maints expansion.

* the definitive air alarm update, and more!

* Departmental emergency EVA suits, signage, tweaks.

* 2 Cryodorms added (oops). Asteroid sound updates.

* Borg cryo, shutters correctly rotated.

* Supply shuttle edit. I like joining the map queue.

* minor fixes, grav gen isolation.

* minor fixes

* Disposal fixes, lighting adjustment

* SabreML feedback changes

* More minor fixes

* More fixes

* NSS Farragus

* (most) floors turn into asteroid sand, not spess

* reverted random file edit, fixed mr teeny

* minor fixes

* big bombs can breach asteroid areas

* Asteroid plating exists, did you know? I do now!

* camera network pass

* walls become sand too on destruction

* lighting pass

* implements feedback, dramatically reduces ores

* yeets ores entirely, sci break room added

* roundstart pads, more solars, bigger departures

* runtimes

* mining resistant rock

* variable names are important

* AoE KA doesnt affect rocks

* actually fix AoE stuff

* now with 1000% more bats

* no sandy cables, a brig exit chute, more head ssu

* mech drills are not pickaxes

* proc rename, perma window, faster sapce bridges

* Brig rework

* robotics changes

* More sci edits

* Rotayshun changes

* dme edit

* Delete cerestation.dm

begone, thot

* temp edit so it loads cere as default

* merge conflicts begone

* decal purge

* map repipe

* removes under-wall pipe adapters

* shuffled maint areas

* dirt purge

* longest bridge rework

* fixes

* PPI feedback

* kitchen does, in fact, need air

* permabrig tweaks

* restores cc changes

* merge part 2

* tag purge

* secret clown HQ got me shook

* SQUASHENING

* solar shuffle

* directional consoles

* remove TM edits due to rotation

* merge conflict part 2

* pod pilot deletion

* cold rock, window tint fixes, etc.

* further red rocks

* further tweaks

* more standardising

* robotics redo

* carpet time

* CI update for cere

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* more squash, corridor cam removal, etc.

* light switches

* minor fixes

* temp cere default

* FOODCART!

* fixes

* no airless no more

* space_hall

* compat pass 1

* make it work

* more changes

* slimmening

* air alarm tweak

* TM commit

* ci tests

* final CI changes?

* squash. squeeze, optimise

* wall vent

* disposals fix, more squeezing

* bugfixes

* false walls

* bedroom culling

* edits and fixes

* tweaks

* changes

* det window

* further tweaks

* Revert "TM commit"

This reverts commit 9e8814937f.

* More TM only changes reverted

* fixes smoothing with falsewalls

* denth changes

* the airlockenning

* cicicici

* CICICICI

* further tweaks

* further tweaks

* reverts weird sand behaviour code from ages ago

* oops

* universal adapter my beloathed

* nanomap moment

* webmap

* cere nanomap

* feedback updates

* updates

* airlock tweaks

* vents and tweaks

* solars moment

* triple APC fix

* south of where?

* airlock helpers

* disposal flap purge

* outpost monitor with actual real networks?

* tweakeroni

* fixes

* fixes

* tweaks

* fixes

* medbay improvements

* power and flaps

* changes

* aa changes

* fixes

* more fixeronies

* fixes!

* reversed

* chemicals

* chem tweaks

* fixes

* shuttle fixes

* holopad pass

* editseditsedits

* lightslightslights

* door

* /obj/machinery/computer/security/telescreen/entertainment

* sonic underground

* actual sonic reference

* Apply suggestions from code review

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

* Tsrc

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-01-17 22:23:09 +00:00
GDN
9e7d8b23ea Replaces some ore box, sleeper, and body scanner verbs with click combinations (#20085)
* Replaces some verbs with alt-click and alt-shift-click

* ryan's review
2023-01-13 16:28:59 +01:00
GDN
fdb1bc1766 Fixes fultons being able to send you into a nullspace like state (#20022)
* fixes fultons sending you into a pseudo nullspace

* Update code/modules/mining/fulton.dm

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2023-01-03 01:20:43 -05:00
AffectedArc07
e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006)
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
2022-12-29 14:28:40 +00:00
warriorstar-orion
a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
Qwertytoforty
f27fdd9dcd fixes crusher trophy misspelling (#19765) 2022-11-24 19:22:19 -05:00
Sirryan2002
61145a02f8 [TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209)
* initial edits

* initial edits

* converting shit over to machinery/economy

* vending and mapping fixes

* vending fix pt.2

* Converts Supply Economy to Use Space Credits instead of Supply Points

* Job Payment, NanoBank, and Paychecks

* clothing type path fixes (damn merge conflicts)

* fixes map typepath issues

* adjusts supply prices

* Vendor Price Adjustments

* account uplink terminal tweaks

* please pass tests

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* reviews and bug fixes

* Review Suggestions/Fixes and Request Console Rewrite

* edits

* vending changes for merge

* typepath fix

* final tweaks

* proc ref fixes

* Fixes and Tweaks from 2nd TM

* rebuild TGUI

* final tweaks

* Apply suggestions from code review

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

* requested reviews

* tweaks

* updates slot machine winnings

* fixes

* GC fixes

* fixes

* oops. still need to deconflict this

* Apply suggestions from code review

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

* requested changes and bug fixes

* atm runtime fix

* requested reviews

* vend act stuff

* attempt to pass tests

* supply packs fix

* user tochat -> debug log

* FINAL FIXES

* removes CC db stuff

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-11-21 23:30:50 +00:00