Commit Graph

408 Commits

Author SHA1 Message Date
Qustinnus
b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00
Rob Bailey
bfb6cf01bb Refactors shield wall generators (#45221)
* migrates the shield generator to the powered typepath

* map update

* fixes wire unsecuring weirdness

* this should go here actually

* minor reformatting + documentation
2019-07-19 08:05:57 +02:00
Gamer025
60ce468d92 Fixed supply shuttle safety warning (#45164)
The safety warning preventing players from reaching centcom did not include any mention of cyborgs or the AI which however still trigger the warning.
2019-07-15 20:01:41 -04:00
Bobbahbrown
e965731cf7 Fix scanning mutated seeds expending their value (#45158)
a little bit of dry run for all my thirsty gamers! 💦💦💦💦
2019-07-13 19:13:57 -07:00
Tlaltecuhtli
59c1d2d4a4 Fix cargo BZ price exploit (#45145)
Costs 4000, sells at 7496.83. Now costs 8000.
2019-07-13 15:33:12 -07:00
skoglol
9c9df48276 Better conscription kit, public lavaland mining vendor (#45089)
* Better conscription kit, public lavaland mining vendor

* no includes plx

* Removes pickaxe, adds seclite.

* Removes the cargo crate.
2019-07-11 20:55:52 -04:00
Krysonism
1edc7fb582 Add cowboy boots! (#44880)
This PR adds 6 new types of cowboy boots. Brown, black and white
cowboy boots have been added to the clothesmate. Two types of lizard
skin boots can be crafted, these boots can then be exported for money.
An additional pair of fancy boots are currently unobtainable, but will
be part of a future project. Cowboy boots can now act as shelter for
some type of snakelike creatures, fill a pair with snakes as a prank
or harebrained assassination plot.
2019-07-05 12:08:22 -07:00
Krysonism
ffe578aacb [READY]Replaces Trekchems with Cobby Category 2 Chems + Chem Tweaks (#44531)
* Adds adjustLiverLoss & getLiverLoss procs to carbon

* Adds trophazole

Adds trophazole, a brute healer that makes doctors take a more holistic approach to heal, It is highly reagent efficient by converting nutriment to healing peptides. Creates an avenue for cooperation between kitchen and  medbay.

* Adds rhigoxane

Rhigoxane is a chilly burn healer that works best in a spray bottle and is capable of extinguishing fires.

* Adds thializid

This tox healer has great potential and mixability, balanced by requiring the doctor to take note of the patients liver health as well as using proper dilution and an iv pole; that wont fit in a powergamers pocket.

* Charcoal  + trans_to changes

Makes charcoal only work when ingested, and adds a new proc in reagent holder, lets trans_to react the transferred reagents if a method is chosen.

* Medical + Syndicate spray bottles

Medical spray bottles have been added to techweb under the biotech node for medical vapor application, alt click to change their skin.
Two suspicious spray bottles have been added as expensive contraband items in the chemdrobe. They have one extra spray range and a random suspicious skin from a pool of 8.
The large spray bottle and the space cleaner bottle also have new icons.
In addition trophazole and MMF have new colors.

* Adds chempacks

the IV medicine bag, or chem pack is the blood pack analogue for chems, it is easy to fill like a beaker but can also be permanently sealed to prevent spillage and mitigate tampering. It can be renamed with a pen. Both the new chem pack and the old blood pack have been added to the medical lathe and biotech node.

* Adds recipes to thializid and trophazole

Also fixes the rhigoxane recipe

* Medsprays are now medigels + fixes

chem packs can now be stored in the smartfridge and chem bag.

Medsprays were renamed medigels to reduce confusion. Calling them medical sprays made no sense since they apply chems through the patch method. 

The lore for the new medigels  is that they spray a thick gel onto the skin that dries into a film.

* minor fixes + mint frosting

I have tried to fix the problems people have pointed out. And the peptides now taste like mint frosting.

* Readds my cleaner sprites

* Adds liver damage to thializid + adds on_transfer proc

Thializid has a liver cost, the cost is worse if you have already sustained liver damage. Fixes weirdness by moving the reagent conversion effects from reaction_mob to on_transfer

* Fixes chem bag examine

The chem bag examine now werks, also fixed a typo in the description.

* Adds a clumsy check to sealing the chem pack

* Makes kelo, bicard and anti-tox unmixable.

I have retained the tricord recipe for now in case someone manages to collect all 3 through non-dispenser means. Think of it like collecting all the dragon balls but lame.

* Makes damp rag apply on_transfer effects

* glass and food now work with trophazole

glasses and food now call the on_transfer proc via trans_to

* Another round of fixes

Replaces 0/1 values with TRUE/FALSE where appropriate. Removes the debug printout from the spray bottle reskin. Replaces one instance of L.damage with C.GetLiverLoss().

* Rhigoxane recipe is now COOLER

200k was too warm since cryostylane cools down so much by itself upon mixing. 
Now the chemist has to choose between adding oxygen for instant cooling or using the heater/cooler to conserve energy.

* Removes the seal() proc and moves its guts into AltClick

* Item_state switching moved to reskin_obj

* Fixes missing medical sprayer left inhand

the sprayer_med_yellow inhand sprite now has the correct name.

* Fixes inhand updating

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

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

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

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Tries to add typecache

* Moves the typecache and makes it static
2019-07-05 09:50:59 -04:00
Akrilla
b2b91a2875 Contract tweaks (#44869)
* Payment generation rework and no repeated target

* Blacklist

* Remove pod explosion

* contractor baton

* darker highlight

* Slight increase for the higher paying contracts

* Victims get healing injected to bring them out of soft crit/crit

* pod send fix

* Text changes

* More text tweaks

* New baton - custom sprite/sound

* Better sound - fixes

* Stutter

* text

* classic_baton rework

* attack silicons still, and only show charging for new baton

* Properly attack/stun silicons where appropriate

* . list
2019-07-03 22:32:40 +02:00
MadoFrog
028383c378 Add mech pilot suit pack to cargo (#44811)
Adds the mech pilot suits featured in Neon Genesis Evangelion as
costumes cargo can purchase. More costumes are always fun.
2019-07-02 16:59:01 -07:00
SpacePrius
89fafd2d82 Add empty crates to Cargo (#44860)
I added empty boxes to cargo, I decided to follow the restriction
stated in the file and set the price to 700, but my original intention
was to have it be 500 so it isn't a completely horrible loss to the
QM, which a more experienced contributed can do if they like. Allows
Cargo to store bulk items easily after they inevitably sold every
crate in the station.
2019-06-30 15:48:07 -07:00
Akrilla
5a605172a9 Fix bad icon state of bounty console printouts (#44733) 2019-06-27 01:04:12 -07:00
kingofkosmos
d7dd679b5a Fix span endings (#44812)
Adds a slash to instances of <span>" --> </span>".
2019-06-26 15:11:03 -07:00
Akrilla
eba239656f Contract QoL and fixes (#44705)
* QoL and location bugfix

* QoL and bugfixes

* Further fixes

* Name fix

* Text changes

* revert delay

* Same fix for returning

* description update

* New TC generation

* Slight delay for ransom cut, so they can hear the beep

* Give a written guide

* Third item

Alright I'm sold, let's try it

* Forgot to add text changes in line with the new item

* Merge conflict

* In datum
2019-06-22 19:13:06 +02:00
vuonojenmustaturska
8ddc9677c7 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-06-19 22:07:57 +02:00
FrankFo
645156ff60 De-linkifies names in deadchat_broadcast(), makes deadsay css class default (#44600)
* De-linkifies names in deadchat_broadcast(), makes deadsay css class default too

* Makes the source argument come after message, since it is optional

* Removes excess </span>
2019-06-18 22:49:02 +02:00
Akrilla
041680be63 [READY] Syndicate Contracts (#44420)
* Emag bounty computer to show contract connection

* Corrupted text helper

* WIP on corrupted text

* Randomly corrupt text when looking at connect screen

* Barebones accessible Syndicate bounties screen

* Contract barebones and Synd UI work

* Further text changes, antag checks

* Further UI changes, full contract generation with areas/target

* dropoff point checks, and move to uplink item for requesting bounties

* WIP contract uplink item

* Contract uplink and continued contract improvements

* Completed contract uplink, and continued contract work

* Droppod WIP

* Further droppod work

* Mob WIP

* Further mob WIP

* No mob

* Callback for putting in mob

* Further WIP with pod checks

* Better location picking and signal fix

* Further pod changes, WIP of payouts

* Overall finished payment/contract system

* Code cleanup


Revert changes to bounty console


Remove debug messages

* Small refactor

* Add kit with set and randomised items.

* Fix box

* Very minor flavor text for inserting into pod, plus roundend text

* Pod return sound

* Contract uplink slight styling changes

* We don't keep giving telecrystals until they literally can't hold anymore

* Ship them off to ninja base instead

* Nerf bring them dead, but give a nice boost for bring them alive

Overall this is a nerf, so we also throw in an agent card to the bundle

* Ship them back

* Minor text changes and slight TC change

* Always give the black and red variant space suit

* Error sounds

* Dropoff area locator

There's sometimes duplicates, i.e. security office - but only one of them will work. This shows you where to go.

* Small fixes

* Bugfix, further changing of TC

* Ransom wip

* Ransom system

* Few changes

* Properly pay for ransoms and appropriate logic for dropoffs

* Terminal sounds

* Talk on command channel when ransom is given, or if they were too late

* Change to announce system

* Announcements/auto pay ransom

* Proper wait

* Name pods properly

* Don't send blacklisted items

* fix

* Improvements

* Announcements are less huge...

* Not a file...

* Improvement

* Drop them not in a wall

* Halves eye blur and styles payment vend

* No memes allowed
2019-06-17 20:32:46 +02:00
vuonojenmustaturska
0b977ac442 Clean up id/bounty console HTML generation (#44365)
* Update bounty_console.dm

* also clean up id console a little bit
2019-06-11 13:46:27 +02:00
shellspeed1
a30fcb6383 Fixes an exploit with plux giving cargo way too many credits. (#44329)
* Update large_objects.dm

* Update code/modules/cargo/exports/large_objects.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-06-09 18:17:23 -04:00
granpawalton
d7fda66cd9 Adds corpse flowers (#44322)
* corpse flower init

* icons

* fixes some bad math

* removes istype helper

* play test changes

* examine text

* .

* found where the conflicts happened

* same
2019-06-07 13:57:14 -04:00
plapatin
1eeca7c854 deletes null crates (#44324)
* deletes nulls

deletes nulls

* hell yeah webeditor time
2019-06-07 09:38:49 +12:00
oranges
6aedfcda5f Merge pull request #44262 from actioninja/fucktheantimatter
Removes the antimatter engine
2019-06-06 22:13:13 +12:00
Tlaltecuhtli
dab6944369 adds bamboo and fixes sugarcane (#44192)
* 1

* 2

* oh fuck

* kjhgfdfghj
2019-06-06 22:06:47 +12:00
Nalzul
47700b8679 Allows you to wear the caution sign + new sprite for the caution sign (#44289)
* +Sprite +Repath

* Adds 5 brute armor
2019-06-04 11:48:47 -04:00
actioninja
1276da64f6 removes antimatter 2019-06-02 01:33:59 -07:00
vuonojenmustaturska
6a106bc877 Remove reagent ids and use typepaths where applicable (#44166)
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
2019-05-31 21:57:26 +12:00
Tlaltecuhtli
987f997783 cargo crates fixes n tweaks (#44000)
cl Tlaltecuhtli
fix: cargo ripley can be actually constructed with what you get from the crate
fix: adds the right crate type to monkey cube and hydroponics refill crates
tweak: readds the bulk wt550 ammo crate
tweak: conveyor belt crate has 15 instead of 6 belts
tweak: adds a laser pointer to the bureaucracy crate
tweak: changes med supply crate to have rng medical things
/cl

single packs are bad when you have an emergency and you use the rockets
2019-05-30 20:33:46 +12:00
Yenwodyah
15ae598f8b Fixes pancake bounty (#43983)
* Fixed pancake bounty

* Grammer
2019-05-16 14:59:48 +02:00
anconfuzedrock
bd37a5d9c9 [Ready I guess] adds saline drip (#43773)
* adds saline drip

* moves the stuff all nice-like

* makes description less ugly

* does src properly
2019-05-13 10:27:45 -04:00
zxaber
f922f2a5a8 Unbroke manifests (#43795) 2019-05-04 13:44:32 -04:00
zxaber
264a1ae108 [Ready] Cargo Catalog small-order support, new single-pack orders, addition of Ripley (#43402)
* Initial changes

* I need my scratchpad for another PR real quick

* Access and code shuffling

* First pass at small_item markers

* Second pass at small_item markers

I think I did this right...

* Maybe I should save the files I have open

* small pack additions

* Update tgui.js

* Removing some (imo) redunadant packs.

* removing 1911 pack

press F to pay respects

* missed a debug

* reorganization

* bit of cleanup

* removed some leftover disabled code

* That red X is bullshit and you know it
2019-04-25 12:25:12 -04:00
Wilchenx
7e4946d0f0 Adds a new Modular PC vendor (#43642)
* b

* s

* Update packs.dm

* Update modularpc.dm
2019-04-23 16:26:05 -04:00
Tlaltecuhtli
ba1f6a77cf cargo crate fix (#43493)
* 1

* alphabet

* probably a typo
2019-04-08 16:05:18 -04:00
Tlaltecuhtli
ec1ad61558 new cargo crates & tweaks (#43454)
* 1

* 2

* finall pre pr

* oof

* oof

* testing merge conflict fix

* test mk2

* test mk3

* plant & chem

* bvcgr

* fixed stuff

* grammar stuff

* fixes clothing + cobby bribe

* new sprites by wjohn

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

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* tweaks .38 stuff

* Update code/modules/cargo/packs.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* nuclear option
2019-04-03 14:23:38 -04:00
MrDoomBringer
4642306b15 does it (#43451) 2019-04-02 21:56:04 +02:00
MrDoomBringer
0c4fe77857 whups i dropped my monster check i use for my magnum sanity (#43445) 2019-04-02 13:58:50 -04:00
Tlaltecuhtli
fde4c92638 fixes vending machines not having refill parts (#43314)
* 1

* 2
2019-03-28 01:55:50 -04:00
Tlaltecuhtli
a616c1231c tweaks the EVA suit crate and miner starter kit crate (#43150)
* tweaks the EVA suit crate and miner starter kit crate

🆑
tweak: the eva suit crate now will have 1 space suit and 1 jetpack
tweak: the miner starter kit will be the same as the ones miners can buy
grammar: changed the description of the medical refill crate to rapresent whats inside
/🆑
those crates were dumb and unintersting maybe now someone may buy em

* Update code/modules/cargo/packs.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* e
2019-03-20 11:00:39 -04:00
ShizCalev
5574b811f4 Add DRAGnet crates (#43166)
There are only two on a couple maps, so might as well add a way to get a few
more if desired.
2019-03-19 23:17:50 -07:00
Militaires
ce9ae7d51c Fix certain alien organs (eyes, tongue, liver) not registering for organ bounty (#43185) 2019-03-19 23:12:20 -07:00
MrDoomBringer
bcff46b8a9 Fixes gondolapods, other centcom_podlauncher misc fixes (#43044)
* improves belly visibility

* misc fixes

* asdf

* extra period
2019-03-19 12:14:08 -04:00
Tad Hardesty
40cfebf2b0 Add some additional type annotations to lists (#43087) 2019-03-17 12:18:23 +01:00
Rob Bailey
ee33e9c6a8 [READY] The war on stun based combat, Phase I: Fuck ranged stuns (#42930)
Nukes the hybrid taser from orbit. Everywhere that spawned it now provides a disabler instead. Standard sec issue? Disabler. Armory? Disabler rack.
Want something with more punch? Beg the warden for a shotgun or an energy gun.
The hybrid taser itself has not been removed from the codebase.
Also removes the stun from the advanced energy gun so it doesn't just become the late game secret powerhouse.
Hoslaser keeps it, but only gets three shots instead of five.
The ebow has been COMPLETELY RUINED as well. See the changelog for details I'm too lazy to copypaste.
Why It's Good For The Game

Fuck stun based combat.
Sec still have their stunbatons, collapsible batons still exist, pepperspray still exists, flashbangs still exist. but now any fight involving sec or anyone who has robusted a sec officer will be less ranged instastun bullshittery.
Changelog

cl
balance: New NT regulations have replaced the standard issue hybrid taser with a pure disabler.
balance: Also fuck the stun mode on the advanced energy gun who thought that was a good idea.
balance: The hos's laser can only fire three taser shots instead of five.
balance: Energy crossbows have been reworked. They no longer paralyze, but instead heavily blur vision, apply a huge burst of stamina damage, and knock you on your ass for one second. Two shots is enough to down someone from stamina crit on both the mini and large versions. The blur lasts for 10 seconds.
balance: The price of the mini ebow has been reduced to 10TC to compensate for this weaker effect.
tweak: The ED-209 is now built with a DRAGnet and fires netshot instead of taser bolts.
balance: Stunshells can no longer be produced in any lathe.
balance: The "pacifier" mech taser can no longer be built.
/cl
2019-03-08 10:30:50 +13:00
MrDoomBringer
a33052797c Gives the Centcom Podlauncher back it's old, sexy, chad UI. Also, prevents all tgui tooltips from FUCKING BLOCKING CLICKS REE (#42911)
* fuck yes


unfucks tooltips


700x700

* u got it anturk
2019-03-03 10:51:40 +01:00
MrDoomBringer
62df21ace8 Update code/modules/cargo/packs.dm
Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2019-02-27 09:26:33 +01:00
Tlaltecuhtli
4895473b6c the robotics assembly crate now actually has bot parts
🆑
add: the robotics assembly crate now actually has parts for 2 of each friendly bots
/🆑
dumb crate reworked into a good one
2019-02-26 18:55:43 +01:00
MrDoomBringer
027b4f2bdd [RED LABEL] Allows badmins to launch shit in from orbit without it looking like its in a pod [activates standing tall for tatorfall] (#42773)
## About The Pull Request

Allows admins to make shit enter the station without pussy supplypods, instead they can just fucking flying in from the heavans
## Why It's Good For The Game

Cus it looks badass as fuck watching mechs just yeet in, also admins can spawn themselves in by literally falling from the sky which is funny
## Changelog

cl MrDoomBringer
admin: Admins can now use the Centcom Podlauncher to launch things without the things looking like they're being sent inside a pod.
/cl
2019-02-25 14:57:18 +13:00
ShizCalev
ee87aff5b7 Makes the emergency internals crate contain breath masks instead of gas masks (#42781) 2019-02-19 16:02:59 -05:00
MrDoomBringer
e011cfe62b [RED LABEL][TESTED][SINGLE][READY][2][MINGLE] Adds an Supplypod Launch Bay specifically for ERTs or Deathsquads (#42614)
* reeling it in

* Revert "reeling it in"

This reverts commit 2b795a8baf5eec89fdc1e6b6a6ef9d36276c2e62.

* adds the room

* makes the boobs more seeable

* WHAT IS CONSISTENT PROC NAME FORMATTING FUCK FUCK FUCK

* adds fluff sign and fixes map a tiny bit

* small updates

* fuck FUCK YOUR MERGE CONFLICT FUCK
2019-02-14 21:12:55 +11:00
pireamaineach
1b670a9c36 Mime-related tweaks. (#42508)
* Mime-related Tweaks

Improves upon the standard beret sprite, aswell as the rest.
Changes the sprite of the french beret to the classic maroon colour, matching the mime's suspenders.
Remove's the mime's pocket protector as it's either rarely used do to the lipstick being nearly useless to mimes, since they spawn with a mask or alternatively, removed.

* Removes the standard beret from the standard costume crate.
2019-01-28 03:14:47 -05:00