* 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>
* You asked
* Tweaks
* Update eftpos.dm
* Adding registers
* good luck meta you'll need it
* Update eftpos.dm
* More sounds
* More sounds, you can pay as long as you're close to the register.
* Tone down the edits, chefs will figure it out
* tim allen grunt
* Update eftpos.dm
* Update eftpos.dm
* Update code/modules/economy/economy_machinery/eftpos.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Ceres is a thing now
* Fix merge
* Update eftpos.dm
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* start of mess
* reflect/parries works
* more pog-ress
* temp icons, .33 to 0.4
* more work, sound, rnd, fixes me breaking shields
* removes this since open pr fixes
* better codee
* attack log
* Final changes / sprites by ramon
* fixes issue
* shoot ramon for the white pixel :^)
* But what if it was a purple glass shard
* Fixes the throw parry
* sorry for so many commits, lower callback
* Apply suggestions from code review
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* Early return, no need to typecast
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5
* grammer / typeblock
* 15 is not more than 15
* how did I miss this, I swear I put in 3
* path + crafting
* Update code/modules/crafting/guncrafting.dm
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Initial defines
* more work
* icon
* more stuff
* UID not hard ref
* tidying
* overload go brrt
* le sound and dead cell
* delet gap
* initial chargepack stuff
* simplify
* oops
* yeet this
* placeholder sprites
* oops magic number
* the gun speaks!
* consolidation
* tweaking and tidying
* so long old gun
* icon purge
* reapplies placeholder
* 1 minute tracker, not two
* makes it use a pinpointer
* revert tiny map changes
* cease your tracking, fool
* oops
* soft refs
* charlie review
* projectile ref to firing obj, removes testing overrides
& cleans up signals
* some more UID null checks
* ICONS
* ICONS CONFLICT
* MORE ICONS
* makes it freaking work
* first pass fixes
* charlie review
* charlie review 2, variable boogaloo
* fixes holsters
* colours the overcharged shot
* and recolours tracker to be yellow to match charge
* yellow laser icon
* widen overcharge misfire %
* fixes unlinkable pinpointers
* fixes gun not speaking when tcomms setup is changed
* steel request
* no chargey
* loudening 2022
* steel part 1
* Apply suggestions from code review
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* restores missing sprites
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* Adds the 100% original and serious BSG
* Adds sprites
* prevents divide by zero
* Adds to protolathe, shield from projectiles, prevents hitting through walls
* adds sprites for inhands, pain, and suffering
* Finished the gun sprites.
* Adds admin version, sound effect, visual
* moves chain to base projectile, adds shitty sprite for bsg explosion
* Fixes it, maybe.
* I hate merge conflicts, gun sprites are back
* I need this, it seems.
* re-adds sprites back
* Prevents turrets from working with BSG, adds a variable for it, heavily nerfs the BSG stun to be more of a trip
* Apply grammer and spaceing suggestions from code review
Co-authored-by: dearmochi <shenesis@gmail.com>
* Makes the code clearer, use update icon, fix shaded charge
* Better inhands, tweaked base sprite
* Better explosion effect, mochi suggestion, PR ready
* Accidently removed this
* I did not intend to put this in, I discarded this change
* Update settings.json
* Spelling and return removal
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* Removes spawn, makes it a callback
* Lowercase states
Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* Refactors Mutations
* traits
* more work
* styling fix
* yet even more work
* oh hush
* almost there
* it continues yet further
* and that's genetics done
* and that's it folks
* last bit and golem fixup
* oof
* oops
* tweaks and fixes
* styling
* DMI files
* Progress
* we compiling
* innate cult action, various progress
* Reorganise runes, fix cult dagger action and admin cultist
* Cult tooltips, dagger icons
* Add mirror shield, return runes back to OG circles
* Cult structure lights, pylon update
* bola update, progress..
* cleaning rune fix, girder/structures anchor
* speed up cult walls
* Convert rune update, tweaks
* Add teleport portals
* fix runtimes
* cult objs start
* move current cult objs to backup
* Rework cult objectives, add narsie/singulo interactions
* spacing, admin log and message
* reviewstuff
* refactor cult conceal/reveal
* add a bit of range to reveal
* blood magic tweaks, hallway not in summon areas
* implement structure concealment, offer uncuff
* add parry sound, fix cult airlock reveal appearance
* Update remaining runes
* fix pylon blood restaure, up blood magic cost
* review tweaks and progress
* fix compilation
* fix offering rune bug
* Draw blood rune action refactor
* moar tweaks
* fixes, holy water blood magic clean, icons
* Add cultist hardsuit, tweaks
* reduce needed pylons for cult ghost, cult shield
* spirit realm fixes
* fix dark spirit
* Add blood rites
* exotic blood handling
* spacing, add adminbus dagger, bal. rune health cost
* woops
missed a var
* fix blood rite healing
* emp spell cult immunity
* fix exploit and narsie references
* new rune sprites
* color defines
* SEND_SOUNDS, cult summon areas
* fix soap, barrier, and add CC location on narsie
* cult structure fix
* functional ascendance, undo cult spacesuit changes
* woops
* whetstone qdel, tweaks
* fix empty area selection bug
* cult ascendance numbers
* add cult blade sprite, add sacrificing head/brains
* review stuff
* fix runtime and twisted cons target
* review stuff
* code clarity
* remove unnecessary cultist checks
* Add support for wizard cultists
* cleanip
* fix concealed glass airlocks
* update objs
* remove talisman ref
* fix status procs
* clarifications, remove unnecessary var
* deconflicting
* deconflicting LF
* oops
* readd new icons
* more conflcit stuff
* readd drill and jaws icons
* review stuff
* silence on conversion
* Readd compact sniper icons
* Remove ambiguity
* 2 sacrifices required
* check antag panel improvements, bug fixes
* limits narsie cult ghost cheese
* CC message
* trailing newlines
* Shade/construct update
* bug fixes
* balance bloodboil, update CC message
* add a newline to something i didnt touch
idk ask travis bout it
* remove metastation extra null rod and shard
* fix teleport runes list, update icon
* remove tg cultist icon
* update cult actions with new tome
* Remove mirror shield throw, spell constructs
Add in sacrificing any brain with a mind.
* Fix more conflicts
* Fix double return
* Add descriptions to cult recipes, fix icons
* fix shuttle curse exploit
* Update wall rune, cult shields, runed recipe width
* implement flagellant sprites, misc changes
* Fix conversion rune
* Add cult blood barrage healing
* Trailing line
* fix whitespace
* Remove can_speak check on invoke
* Deconflict pt. 2
* Bugfixes the 1st
Fixes bugs 2 and 4 in the 'Known Issues' section
* cult.dm tweaks
Oh boy, even more commits!
* Fixes blood halberds swapping directions on wield
* Tweaks and stylin'
Changed a few span classes around and added a 'Remaining Charges' display to the Blood Rite spell
* Ritual tweaks (And some other stuff)
Fixes:
Altar stray pixel,
Using 'Twisted Construction' on a cult door,
Rune drawing checks,
probably more idk
* Rune tweaks & fixes
Fixes:
Wraith glowing not turning off while jaunted,
A MASSIVE oversight by me with playsound(),
probably also some other stuff but I've been staring at this file for a week and I've forgot most of what I did.
* Testmerge fixes the 1st
Fixes:
Ascendent is now Ascendant,
The Cultist greeting is now in the correct order,
IPCs now draw oil coloured runes,
No longer able to sacrifice a body multiple times,
Sacrificing a brain or head now gives a soul shard,
Converting an IPC or someone with robotic limbs now heals them correctly,
Probably more.
* Mirror Shield balancing
Being hit by a projectile above a damage threshold (10) now increases the chances of the mirror shield shattering, by 3% per damage point.
This may seem pretty low, but an Energy Gun would have a 30% chance of breaking the shield per hit. (Assuming I did this right, anyway.)
* Insect repairs and more
Changes:
Makes the shuttle curse lines a define,
Comments out the changing construct names,
Made flagellant robes block hair,
Added documentation to the mirror shield (See said documentation for details),
Made the cooldown examine text for cult structures display minutes and seconds,
Removed the ability to sacrifice the same body multiple times,
Cleaned up the soulstone code (and hopefully didn't break anything),
Probably still missed something, oh well!
* Rune opacity and Stun timing
Changes:
Halved all the values of the 'Stun' spell, since it was presumably an oversight. (20 second stun to 10)
The 'mouse_opacity' for runes has been set to 'opaque', this means that clicking on any spot on the tile will select it. (Less fiddly)
The '(REMOVE SPELL)' choice when choosing spells now only shows if there's any spells to remove.
Dunking someones head in the lava forge now only works if they have a head.
Also fixed a whole bunch of typos/gramatical errors.
* Blood Boil, Blood Barrage and EMP Sprites!
Changes:
Overhauled the 'Blood Boil' rune (See documentation)
Added in-hand sprites and red sparks for 'Blood bolt barrage'.
The nar'sie rune now removes all runes around it to prevent clipping.
Fixed runtime when examining the 'Arcane Barrage' spell.
Added new sprites for the EMP spell, courtesy of @kugamo!
Co-Authored-By: Kugamo <thekugamo@gmail.com>
* A few more tweaks
Changes:
Halved the percentages of 'Rise' (Glowing eyes) and 'Ascend' (Halos) to 10% and 20% respectively.
Hopefully fixed shield walls being passable while active.
Changed "Nar-sie" to "Nar'sie" in a few places.
* TM 2 fixes
Changes:
Teleport runes now only show the user when the animation has finished.
Cult shields are now invisible to ghosts when disabled.
Crayon runes now use the new rune sprites.
Construct night vision now actually works.
You can no longer soulstone yourself.
The death message for cult structures is now bigger.
Cult objectives are now displayed at roundstart.
Tweaked the icons for artificer spells.
Tweaked some cult related 'Tip of the round's.
Summoned cult ghosts no longer show in the 'Check Antagonists' panel when dead. (Hopefully)
* Cult members and Deconversion
Changes:
Using the 'Study the Veil' ability now shows how many members the cult has.
Holy water now unequips all cult clothing on deconversion. (Flagellant robe, blindfold, etc.)
Nar'Sie no longer warns admins that it doesn't have a containment field.
Fixed Zealot's Blindfolds not temporarily blinding any non-cultists who touch them.
The 'Summon Cultist' rune description now explains that restrained cultists cannot be summoned.
Fixed Travis (Probably)
* Cult Rise/Ascend balancing V1
The values here will almost certainly need some tweaking, but I feel like it's better than it was before; and certainly more customisable.
* Possibly maybe hopefully (one of) the last commits
Changes:
The cult halo no longer vanishes on relogging.
It's now possible to drag things on to runes again.
* A few minor fixes, and a major one
Changes:
Resetting your action button positions no longer completely breaks blood spells.
The downside to this fix is that Blood spells can no longer be moved around, so sorry sorry about that.
Fixes: #14393Fixes: #13855
* New weapon sprites!
Adds fancy new sprites for all cult daggers and swords, courtesy of @McRamon!
They will need adjustments for Vox and Kidan at some point, and the Skrell inhand can look a bit odd at times, but those are also problems for every other weapon in the game so that can be fixed later.
Co-Authored-By: McRamon <31545294+McRamon@users.noreply.github.com>
* TM 3 fixes
Changes:
Fixed action button related bugs, including making them movable again! (probably caused a bunch more but eh),
Slightly tweaked threshold for ascendance,
Blood Rites now cleans up slime blood,
The Deconversion message is now bigger,
Flagellant robes now take 5% more damage (Lasers do 30 damage rather than 29),
Teleport runes can no longer be erased while a portal effect is open,
Teleport rune portals now always show the Z-Level if they're not in station space,
Teleporting another player no longer makes you temporarily invisible,
Attempting to summon a restrained cultist now gives said cultist a warning message,
Fixed a runtime when placing a soulstone in a construct,
Cultists now show on the Orbit menu if you have AntagHUD enabled,
Fixed a few typos
Co-authored-by: datlo <quentinkoyote@gmail.com>
Co-authored-by: Kugamo <thekugamo@gmail.com>
Co-authored-by: McRamon <31545294+McRamon@users.noreply.github.com>
* Adds Botany Jugs, and lid test for hydro trays
* adds 1u and 2u transfer amounts back to changed items
* fixed item references in some .dmm
* improves weed/pest killer jug sprites, and corrects overlays procs
* removes uneeded image def
* improves sprites further
* adjusts coloring of l4z reagant
* Buffs Jugs to 80u each (from 50u)
* balances nutrient vending numbers
* resizes jugs
* fixes conflict in .dmi
* Resizes Jugs again
* removes commented out code
* Fixes
* futher fixes
* Fixes some issues, adds sounds for jugs.
* reverts to using New()
* removes jug.dm and reverts all nutrient back to bottles
This commit ports /tg/'s move refactor.
The throwing system has been replaced entirely, removing the necessity
of throw_at_fast and resolving multiple outstanding issues, such as
crossbows being unusable.
Spacedrifting has also been upgraded to function with the new throwing
system. It is now it's own process.
Tickcomp has been killed, and the config values have been adjusted to
more or less match live Paradise.
All mobs now share a common Bump() proc. There are only four mobtypes
which do not, including humans and simple animals. With the exception
of mob types that do not ever want to Bump() or be Bumped(), they should
call the parent proc.
Human movement slowdown has been moderately tweaked in how it stacks effects;
It shouldn't be significantly different from a player perspective.
Mobs will now spread fire if they bump into another mob. I don't want to set
the world on fiiiire, I just want start a flame in your heart~
For player facing changes: Input delay has been reduced by roughly ~50ms for
any direction keys, by advantage of a previously unknown flag on byond verbs
which allow them to operate independently from the tick rate of the server.
You may need to clear your interface.dmf file if you have a custom skin for
this change to function.
- Ports https://github.com/Baystation12/Baystation12/pull/9184 from
Baystation
- Prevents deconstruction of soil and invisible soil
- Fixes#1011
- Adds a verb to eject tanks from hydroponics trays if one is inserted
- Don't think anyone has actually done this, but it has been possible
for a LONG time and will be more useful once I get the atmos portion of
botany working
- Fixes grown items not leaving behind their trash
- Notably banana peels and corn cobs. Clowns and hillbillies rejoice!
- Adds 15% chance for a watermelon to leave behind a pack of it's seeds
when eaten.
- Slicing watermelon will not produce seeds ever
- Replaces the Janitorial ERT members' plant-b-gone sprays with new
Telescopic Scythes!
- Can be collapsed to fit on a belt or fit in pockets/bags
- While collapsed, it loses a large amount of it's damage, is not
considered sharp or as having an edge, and cannot cut vines like a
normal scythe. Extended ones are functionally identical to normal
scythes
- Extending and collapsing a telescopic scythe has some awesome sounds
from Freesound.org
