Commit Graph

1310 Commits

Author SHA1 Message Date
Alberyk
c4479586c1 Ports material and makeshift armor from Polaris (#3968)
-adds support to material clothing, already used by rings and makeshift weapon
-adds makeshift armor that you can craft using buckets for helmets and material sheets to make the plates
-adds a wooden bucket that can be crafted using planks also ported from polaris
-adds icon_has_variants to some sheets, adding sprites to them from tg
-fixes bronze being just a place holder
-adds sheet types to bronze and titanium
2017-12-23 21:12:39 +02:00
LordFowl
2ac73351b8 Unapologetic Vaurca Buffs (#3949) 2017-12-12 13:15:45 -06:00
LordFowl
f03485be5a Unapologetic Diona Buffs (#3829)
Dionaea nymphs will now follow a player dionaea nymph spawned from a gestalt splitting, instead of just shuffling aimlessly in place. The player furthermore can switch to any uncontrolled nymph that split from them originally at will, and automatically switches at death.

Dionaea gestalts can use the station variant of devour, just like their nymphs will.

Dionaea regrowing severed limbs has been fixed.

Dionaea and nymphs not gaining biomass from consumed food has been fixed.

Devouring will now actually finish instead of stalling on the penultimate stage forever, no longer leaving the devouree in a perpetually near-death state.

Fixes #3701
Fixes #3698
Fixes #3703
2017-11-29 10:33:02 +02:00
Ron
2dd08367b8 Adds shaking soda cans (#3811) 2017-11-16 11:24:11 -06:00
Alberyk
8dd97ed30b Adds new reagents and recipes (#3688)
This pr adds some new reagents and recipes, to be used properly with the feature added by #3522.
2017-11-15 23:11:51 +01:00
skull132
7dc02be204 Merge branch 'master' into development
# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
2017-11-11 20:57:28 +02:00
Alberyk
61066914d8 Skrell and estus fixes (#3824) 2017-11-10 23:27:07 -06:00
Synnono
a0d588ba1c Bar Update 2: Electric Boozealoo (#3795)
* Added 13 drinks, mostly cocktails. Added lemon juice in carton format. Added Lemon juice, boukha and fireball to the booze-o-mat.

* More drinks, fixed the Old Fashioned a la Incog, tweaked a few of my recipes.

* Added drinks, added brownstar to the soft drink dispenser, modified descriptions.

* Finished adding drinks, tested all recipes, adjusted reaction values.
More testing to follow

* Renamed fireball, recipe tweaking/testing. Added sprite for metropolitan.

* Testing, spelling pass, adjusted some erroneous tastes or descriptions on other drinks.

* Changelog meme

* White wine. Last minute.

* formatting in description text

* Instances of wwine changed to whitewine.

* Typos
2017-11-05 22:44:28 +01:00
Erki
7b1bcdc8f3 October Bugfix Bonanza (#3767)
Fixes #3742 - someone unfucked the fix again.
Resolves #3740 and resolves #3739.
Fixes #1558 - a 10 month long meme is dead.
Resolves #3720 by making robo-eyes immune only to the eye stinging effects of pepperspray. Let there be equality amongst the synths.
Fixes #3676 - tested, shouldn't break. It was double-calling set_death_timer.
Fixes #3672 and fixes #3658 - that was my bad on not noticing the diff around hologram.icon = icon vs add_overlay(icon).
Fixes #3762 - I'm surprised this didn't fuck over more.
2017-10-29 19:03:24 +02:00
Ron
0d0117dcff Fixes some runtimes (#3727) 2017-10-22 02:37:44 +03:00
TheGreatJorge
0aff2d8785 Coloured lighting & related stuff (#3555)
Makes all light tubes & bulbs have colour according to the light they emit. There are 6 preset colours: RGB CMY. Any other color is possible by simply changing the already present brightness_color variable. This PR makes it so it actually changes the color of the item and wall object too.
    Added two new colour defines used only along with preset coloured lights.
    Coloured lights are only obtainable by random maintenace loot, cargo spawn or trader.
    Added box of randomly mixed light colours and box for every preset light colour.
    Removed two sets of redundant defines.
    Converted light item New() to Initialize() (hopefully correctly).
    Made couple tiny tweaks to the lights code.

EDIT, 7. Oct 2017:

    When you hit light machinery or item with paint, it will change it's brightness_color var, instead of the color var.
    Paint buckets can now paint items and people again.
    You can now wash paint off by spraying yourself with fire extinguisher or otherwise covering yourself in water.

EDIT, 8. Oct 2017:

    Removed one apparently unused global list.
    Converted pain bucket New to Initialize and changed it's pathing style.
    Shower can now wash paint too.
    Fixed paint bucket sprites to be bit more dynamic and fixed the in hand sprite. Also added bucket lid.
2017-10-10 18:46:24 +02:00
Alberyk
01990fb1e8 Adds the sarlaccs and some golden slime fixes (#3533)
-adds the sarlaccs from fowl's old mining pr, to be used in an event and for general adminbus/maybe in the mining mob's future pr
-blacklist some mobs from spawning via the golden slime
2017-10-07 13:15:34 +03:00
Alberyk
25c805de1c Adds more food recipes (#3544) 2017-10-07 00:41:29 -05:00
Alberyk
8e53ea0c78 Cult and antag fixes/tweaks (#3524) 2017-10-02 22:34:01 -05:00
Ron
aa57b9556e Small chemistry changes (#3525)
Beakers now show a message if they have solids inside
Added an accuracy rating to containers. Containers will only tell you how many units of chemicals there are according to how accurate they are.
2017-10-01 15:18:48 +02:00
Lohikar
913e47721e Make chemmasters default to transfer-to-beaker (#3513) 2017-09-28 21:42:37 -05:00
Lohikar
085e4840e7 Reagent & Overdose tweaks (#3499)
Generalizes dionae reagent checks to reduce if (alien == IS_DIONA) checks.
Reverts #2444, #3116.
Closes #3270.
Fixes some potential GC issues with some reagents and their modifiers.
2017-09-25 10:59:30 +03:00
Belsima
5f2b3b2695 science! (#3464) 2017-09-20 17:10:50 +02:00
Lohikar
1add9088b2 Make blood use weakrefs & fix fixblood (#3384) 2017-09-14 20:32:53 +02:00
Lohikar
e28c29a551 Port Integrated Electronics from Polaris (#3371)
Ports Polaris' integrated electronics system, whichallows for Roboticists & Electricians/Engineers to build custom devices and machines for a variety of purposes.
2017-09-12 21:41:39 -05:00
Lohikar
8f4b4effae Kill processing_objects (#3398) 2017-09-09 15:22:58 -05:00
skull132
16d33365c2 Merge branch 'master' into development
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm
2017-09-09 21:38:02 +03:00
Alberyk
c5a7bc0361 Dropper, flour and ration fixes (#3413)
-fixes being able to use dropprs on synth
-fixes flour stacking on the same title
-fixes liquid ration having far less nutriment that it should
2017-09-09 18:59:10 +03:00
Ron
752b0ba5e9 Converts reagent containers to Initialize, fixes hand-chew cool down and moves suit sensor Z-level list (#3367)
Converts all reagent containers to use Initialize, fixes the hand-chew cool down so it's no longer for everyone, and moves the suit sensor Z-level to the global.dm right above the station name so anyone else using the code can't miss it.

Closes #3363
Closes #3361
Closes #3362
2017-09-02 21:35:58 +03:00
Lohikar
c80d893e71 Misc Synthetic Code Cleanup & Minor Tweaks (#3307)
Mostly synthetic code cleanup, some tweaks to human examine and ID cards too.

changes:

Synthetic sprint procs have been compressed down to one proc for all machine subspecies vs. one per subspecies.
Synthetic sprint now only stuns synthetics with empty cells for 30 seconds for all types.
Refactored synthetic limb roboticization.
Changed how a lot of synthetic/industrial checks work.
ID portraits are now 128x128, and scaled without blurring.
Species can now specify an examine text color (for their species name) that differs from their flesh color.
Fixed some eye checks not respecting species.vision_organ.
Examine pulse-checking now uses do_mob & has a progress bar.
2017-08-29 23:21:29 +03:00
Lohikar
f3ad54e8aa Assorted tweaks & fixes (#3305)
changes:

Fixed #3203.
Tajara or Unathi CEs now get gloves that actually fit them.
OOs now respect direction changes from their mimicked object.
Replaced all references to trange() with RANGE_TURFS().
Replaced all references to is_type_in_oview() with locate() in oview().
Fixed a runtime caused by recursive explosions falling off the edges of the map.
Carp despawn now works properly with the new asteroid turfs.
Carp despawn now uses WEAKREF instead of SOFTREF.
Added tick-checks to the carp migration event.
Vaurca now have the IS_VAURCA reagent_tag.
Cleaned up butanol alien handling a bit.
2017-08-20 14:10:15 +03:00
Ron
cb5e227320 Converts some istype's to use helpers (#3224)
Converts various istype's to use helpers. Mainly:
Cable
Wrench
Screwdriver
Multitool
Crowbar
Wirecutter

And makes the helpers defines.
2017-08-06 22:08:42 +03:00
Alberyk
b4fa4a8b3a Baystation12 merchant port (#3155)
Port of the merchant mechanics from baystation12.
All of the trader, prices and most essential system are done, as well the job datum and the like. Mapping the shuttle, the base and a new dock will be done in a later pr.
Also adds phazon construction and several other items used in this pr.
The chance of the merchant slow being open at round start can be changed via the config, it is 20% by default.
2017-08-04 21:36:04 +03:00
SoundScopes
b0e8170f78 Adjusts ChemMaster's layer (#3212)
It's a fix #3196 for some reason git didn't link the pr with the issue
2017-08-02 19:52:59 +03:00
skull132
fd7aea8901 Merge branch 'master' into development 2017-07-31 21:58:50 +03:00
Wraithcraft
219ce42ac8 Cocktails patch (#3167)
Adds Champagne, Bitters, Mint Syrup and 11 different cocktails. All of the spritework is awful. I'm sorry about that.

Cocktails: Champagne Mojito, The Classic, Cork Popper, French 75, Muscovite Mule, Orange Mimosa, Pink Gin, Pink Gin and Tonic, Pirate Punch, Planters Punch and Southside Royale.
2017-07-29 00:38:39 +03:00
MarinaGryphon
a7f7cfe523 Fixed an issue with coffee beans from Cargo. (#3154)
Fixes #3152
2017-07-28 21:12:19 +03:00
MarinaGryphon
4c920dc52e Various coffee (and coffee maker) changes and fixes. (#3149)
Lets Cargo order coffee beans and a coffee maker, under Hospitality. The bridge, which is the only place that has a coffee maker, only has 100 units of black coffee and no way to replenish it. Most people don't even know about the hidden types of coffee, and I might add more in the future, so I wanted it to be more accessible.

Additionally, I made the two types of coffee actually able to be made.
2017-07-25 20:49:47 +03:00
Alberyk
f847615a79 More bug fixes: vending machine, scout rifle sprite and missing disposals (#3146)
Fixes #3113
Fixes #3117
Fixes #3112
Fixes a light being on the way of the lift's airlock at cargo
Fixes the scout rifle not having a wielded sprite in hands
Adds hop access to the pda and cartride vending machine
Move ambrosia in the seed vendedor to the contraband list
2017-07-24 14:16:49 +03:00
Alberyk
dab522488a Tweaks how overdoses works and medicine related overdose (#3116)
-overdoses should happen at the start of the processing, instead just at the end, giving more chance for people to react to them
-reduce the damage from overdoses related to medicine and made anti toxin have a normal overdose cap
2017-07-21 21:26:24 +03:00
Ron
ef582313d1 Removes some unneeded debug logs (#3070)
Removes some unneeded debug logs.
2017-07-16 21:57:52 +03:00
Alberyk
ac5b4ea055 Food, hair and grammer fixes (#3058)
Fixes #3051
Fixes #3055
Fixes #3057
Fixes #3061
Fixes some food having no taste, also fixe cheese tasting like meat and other minor things like grammar.
Removes the ,45 magazine from the warden's locker, and give them a helmet to match his armor
Fixes a missing window at the main central level
Fixes a messed up hall at central command
Adds a small room for interview for the ccia in the odin, that was left out due to map issues
Adds the captain chair overlay that I forgot to add way back
2017-07-16 11:56:13 +03:00
Alberyk
2f949ecb45 Ports baystation armor system (#2954)
Ports Baystation12/Baystation12#12658

Changing how the calculation of armor works , instead of just being a check if it is protected fully, half or nothing. Making armor more reliable and less rng dependant.

Also, uranium meteors will irradiate nearby people when they explode.
2017-07-15 16:24:03 +03:00
Alberyk
1bda977ae7 Makes the cavern dweller more interesting. (#3029)
Adds an unique type of meat to the cavern dweller, with hyperzine, giving people a reason to hunt them down like carp. Also, replaces the old sculping block sprite with one that shares the same color of our mineral walls.
2017-07-15 16:21:42 +03:00
Lohikar
b5472e50f4 Convert a fuck ton of machines to Initialize() (#2985)
Needs testing, but shouldn't break anything. Also adds Destroy() to the SMES base class.
2017-07-14 20:08:59 +03:00
Lohikar
687e56a8e0 Replace a bunch of overlay calls (#3005)
changes:

Converts a bunch of manual overlay manipulation to SSoverlay calls.
Moved more cache lists to SSicon_cache.
2017-07-13 21:12:53 +03:00
Alberyk
12bfdd2f79 Fixes foods not having the right tastes (#3019)
I forgot to do this in my old pr tastes, also includes changes from #3017.
2017-07-13 21:04:31 +03:00
skull132
8495fdd084 Runtimes, 10JUL2017 (#3003)
Nukes a couple of RTs:
2017-07-12 00:15:11 +03:00
Alberyk
1b19877917 Ports taste mechanics from baystation (#2864)
This pr will port the baystation 12 taste system. Also tweaks some drink's strength.
2017-07-03 02:27:43 +03:00
Lohikar
51c967d554 Kill a bunch of unneeded lists (#2851)
Removes a bunch of default lists from /obj, /obj/item, and /obj/structure, replacing them with either lazylists or adding behavior to the null value.

Null armor is now considered identical to having armor with 0 armor in each category, null attack_verb results in the text "attacked" being used.
2017-06-28 23:10:33 +03:00
Alberyk
013a361ca3 Adds changeling horror form (#2819)
Adds an end game power for changelings (15 genomes points), allowing them to turn into a robust mob for around five minutes.

Fixes some issues with arm blades and shields, also adds a chem costs to using them.

Adds new changeling related sounds.
2017-06-28 14:23:49 +03:00
skull132
324dba97dc Fix some runtimes (#2755) 2017-06-18 13:48:24 +03:00
Lohikar
521705dc62 Soft-delete fixes & Tajara Coffee overdose tweak (#2749)
changes:

Fixed issues with parallax objects not deleting properly due to hanging refs. (this also seems to fix some mob delete failures, like BSTs)
Fixed issues with hyperzine, inaprovaline, and synaptazine not soft-deleting due to hanging modifier references.
Removed coffee overdoses poisoning Tajara at Mofo's request.
2017-06-18 13:35:24 +03:00
Lohikar
cf919b55e5 Remove butanol from chemistry dispenser (#2728)
Removes butanol from chemistry's chemical dispenser, as it is not actually used in production of anything, unlike ethanol.
2017-06-17 22:21:10 +03:00
NanakoAC
17850e797e Box Nibbling Rework (#2131)
Currently, a mouse gnawing open a box to get its contents generates about a screen's worth of chatspam. And the same applies to eating a box of raisins or similar large meal. I feel this isn't appropriate for the size of the creature nor the severity of the act. In any case ive come up with a better method.

Main attraction of this PR, is that the box nibbling no longer uses visible messages, it only outputs to chat once, when it finally ruptures. In the meantime, any nibbling which doesn't break the box will instead shake it around and make a nibbling sound. Shaking code stolen from locker resist
Mice nibbling things is a quiet clicking noise, easy to ignore. so its unintrusive
Update: I've now extended this to all animal nibbling, not only boxes, but also on food too. To cut down on chatspam from small animals eating things.

The result of this change is that a creature eating a box or a meal is simultaneously easier than before to notice, if you care about it. And easier to ignore, if you don't care.

Also included, two bugfixes:

Re-adds the reverted console canpass behaviour that was lost a couple patches ago
adds a little robustness fix to animals, to deal with an issue where they were getting their stat set back to 0 without properly waking up. still not sure why it happens but now the icons will properly update when they do
2017-06-15 12:32:40 +03:00