Commit Graph

1530 Commits

Author SHA1 Message Date
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
Synnono
7d52b164a6 Snowflake Qipao DLC (#2659)
Updates the red cheongsam to not be a stoopid recolor of the white one. Now it is a stupid recolor with a unique design. Attempts to make it show up over shoes have failed, to great sorrow. Recommend not wearing any cheongsams with jackboots.
Fixes quiche and keylimepie slice nutrition so that they don't go away in one bite.
2017-06-10 22:39:59 +03:00
Werner
eab6ec1d28 Alternative Borg Hypo Fix (#2623)
This is a alternative solution for the borg hypospray issue.

As suggested by various players, this removes the cooldown again and replaces sleeptoxin with tramadol.
That would serve the purpose of reinforcing the behavior that the medical borgs are not designed for combat, but still allow them to operate on patients if they need to.
2017-06-10 17:23:34 +03:00
Alberyk
e8cbf0fe50 Adds violin destruction (#2575)
Attacking people with the violin will not break said instrument. Also, shooting bottles will now break them as well
2017-06-03 11:32:37 +03:00
Alberyk
e2acfcd38e Makes species with the NO_BLOOD flag immune to most chemical stuns and effects (#2568)
Makes species with NO_BLOOD (skeletons, shadows, golems, etc) immune to most knock down/stuns/etc chems, no more injecting skeletons with chloral hydrate.
2017-06-02 18:59:41 +03:00
Synnono
ebaffcfaf5 Synnono Meme Foods Recipe Expansion (#2567)
Adds 26 new recipes (18 Microwave, 5 Oven, 3 Fryer) to the kitchen, including curries, dank (and sliceable) brownies, and bear meat recipes!

Adds 2 new reagents: Space Spice, a condiment found in the kitchen flour closet and used in many of the new recipes, and Brownie Mix, a dry mix of flour, sugar and cocoa that serves as the base for brownie recipes and doesn't conflict with other baked recipes.

Adds sprites for new foods, as well as new trash sprites for dumplings and brownies.
2017-06-02 16:39:24 +03:00
Alberyk
8d1fe5b829 Fix ipcs being blinded by pepper spray (#2561)
Fixes #2559
Fixes #1154
2017-06-02 01:17:57 +03:00
Alberyk
19c449b336 Buffs plantbgone to don't be useless (#2563)
Buffed the toxin damage of plant b gone, not back to old levels, but enough to be far more useful and noticiable.
2017-06-02 01:13:29 +03:00
Ron
32204aabaf Borg Hypospray Change (#2547)
This makes the borg hypospray take 3 seconds to inject someone.

Associated thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=8197
2017-05-31 11:43:46 +03:00
Alberyk
09243fa0ff Chemical overdose changes (#2444)
People gon' die.
2017-05-29 22:41:21 +03:00
LordFowl
cae2fa1fdd New Map Pets and Z collateral (#2503)
Fixes #2499
Fixes #2495
Fixes #2493
Fixes #2480
Fixes #2487
Fixes #2491
Fixes #2492

Gives the head of security Lieutenant Columbo, an attack dog with a special sprite that deals slightly less damage compared to other attack dogs.
Replaces Poly with floor B.O.B.
Gives Lamarr's cage a little more breathing room.
2017-05-28 14:15:22 +03:00
skull132
22c7748336 Merge branch 'master' into development
# Conflicts:
#	code/game/machinery/computer/shuttle.dm
#	code/game/machinery/doors/firedoor.dm
#	code/game/objects/items/weapons/weaponry.dm
#	code/modules/admin/admin_attack_log.dm
#	code/modules/admin/admin_verbs.dm
2017-05-27 20:11:54 +03:00
skull132
fd6a8305a5 Letting skull touch logging is now strictly haram (#2476)
Turns out. I did a bad.
2017-05-27 18:56:22 +03:00
skull132
c27866e4af Merge branch 'master' into development
# Conflicts:
#	code/_helpers/logging.dm
#	code/modules/mob/living/living.dm
2017-05-25 15:06:32 +03:00
Ron
8386075565 Bug fixes (#2447)
Fixes #639
Fixes #2445
Fixes #1708
Makes succumb tell you if you can't succumb.
2017-05-25 14:42:57 +03:00
Lohikar
3be27b9efa Merge SSnanoui & Nanomanager (#2427)
Merges the NanoUI subsystem with Nanomanager, as well as cleans up some nanomanager code.
Most of the files in this commit are changed as a result of removing the nanomanager global in favor of the SSnanoui global.
2017-05-23 16:33:00 +03:00
Ron
790480c8da Removes all \red and \blue's (#2309)
Removes all \red's and \blues in favor of span classes. \red things that were bold were replaced with danger because it's warning but bold.
2017-05-21 12:07:57 +03:00
LordFowl
20c1ca90b5 Lifts and more (#2269)
Changes the main access lift into two seperate lifts. Should vastly decrease congestion.
Changes the AutoLocker into an AutoDrobe, a floor mounted pad that does what the autolocker did instantly. Should solve round-start confusion.
Fixes a handful of bugs.
Off-topicedly, pretty much doubles Vaurca starting phoron, adds more phoron to K'ois and K'ois byproducts while removing more K'ois from raw K'ois. Adds a moderately expensive K'ois bar to the snack vendors for until I can figure out how to code phoron suppositories.
2017-05-15 18:52:39 +03:00
Ron
17654c608a More Holidays (#2265)
Adds more holidays and removes old ones. Also adds a little fun thing for Easter.
2017-05-14 23:37:06 +03:00
Lohikar
6cf332bfa7 Merge voting controller into SSvote (#2183)
changes:

Merged the voting controller into the voting subsystem.
Changed the voting UI to use /datum/browser.
Converted /datum/browser to use HTML5 & attempt to use edge if available. All users of the browser datum have been confirmed functional with Edge.
Changed the ChemMaster to use SSassets for resource download.
2017-05-13 12:37:43 +03:00
NanakoAC
26a35147cc Poison Balance Tweaks (#2075)
A small tweak patch to fix some odd balancing issues with certain chems. Generally homogenising the poison chems to have less instakill options and see a little more use from the less common ones

Majorly nerfed polytrinic acid, because it was lethal at 5u dose
Majorly nerfed mercury, it was a 30 second kill and its available in the dispenser.

Minorly nerfed a couple of other things, mostly standardisation - factoring in removed where it wasn't before. doing flat effects every metabolism tick is generally bad. This was the issue with mercury.

Buffed the base metabolic rate of poisons. its still generally extremely slow

Buffed lexorin by removing the (irrelevant) brute damage and adding some extra oxyloss instead (doesn't heal due to the losebreath effect). This should make the changeling's death sting not entirely worthless.
2017-05-03 22:08:14 +03:00
Lohikar
f6dc33a465 Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)
* Replace SSingulo with SScalamity; processing cleanup
- SScalamity now handles blobs as well as singularity-types.
- Processing subtypes have been simplified to not require a stop_processing definition.

* this is probably important

* Remove cascade disabling SSgarbage

* Fixed a bug where dust() did not qdel the target mob

* Misc fixes

* Fix decals surviving break-to-plating

* Subsystem flag tweaks

* Apparently subsystems are new'd before config is.

* Fix paper icons

* Speculative fix for insane lag

* Better machinery stat

* Make organs not use SSoverlay

* Misc bugfixes & tweaks

* Nightmode fixes

* Changelog for SMC

* Port /tg/'s improved MC crash handling

* Add some more SS Recover() procs

* supply_controller -> SScargo

* More New() -> Initialize()

* pAI and robot construction overlays

* Fix cargo unit tests

* Merge the DMM Suite's atom/New() into atoms_init

* Lighting pre-baking

* Lighting initialization logging

* Fix some bad SS init orders

* Fix SSlighting logging; rename Processes to MC

* Speculative fix for insane GC lag

* Prebaked openturf/icon_smooth & fix lighting prebake

* SS init status; SSatoms LATEQDEL

* Fix bug with MC init stat panel

* Fix parallax

* Misc

* Ignore SS_NO_DISPLAY during init

* apparently this is important

* REEEEEE

* Image GC fixes; broadcaster radio-new sanity

* RCON Cleanup

* Move pAI recruiter into subsystem

* Move global solars list into sun subsystem

* Make chickens not use a global

* Demote SSdisposals to SS_BACKGROUND; garbage-debug cleanup

* Speed up space init a little

* Fix bad timer flags on floor drying

* Subsystem panic-restart verb for mins

* Explosion speedup

* Minor subsystem & MC logging tweaks

* SSopenturf improvements

* Make pipenet actually initialize (whoops)

* Minor tweaks

* Implement lighting rounding

* comments are hard okay

* Minor lattice tweaks

* Fix some timer issues & better closet init

* Timer sanity

* Request console tweaks + Storage init sanity

* Minor SSmachiner RCON improvements

* Further reduce world-start timer count

* Standardize subsystem logging

* Garbage hard delete profiling from /tg/

* Timer hang detection & recovery

* Log machines that sleep in process() and fuck up SSmachinery

* Fix an issue with external airlocks sleeping in process()

* Failsafe logging

* Minor tweaks

* Revert "Request console tweaks + Storage init sanity"

This reverts commit 98d3579e35.

* Re-implement RC changes

* Fix SQL FT saving

* Fix SSmachinery sleep in disposals

* Minor SS tweaks

* Paper fixes

* Blood drying fixes

* Merge gameticker and SSticker

* Minor global list init cleanup

* Lagcheck biogenerator & bags

* Tweak SScargo init order; RIG Initialize()

* Caching tweaks

* Remove rogue comma

* Initialize fixes

* Lighting destroy cleanup

* Fix emagging airlocks

* Initial SSicon implementation

* Tweaks & Fixes

* Fire + Air alarm queued icon updates

* Overlays + Queued icon cleanup

* Runtime & background fixes

* Kill some meaningless set statements

* Kill some image qdels

* Bump up lighting rounding val

* Fix adv. scanner destroy runtimes

* Remove unneeded icon update limiting

* Move icon smoothing into helpers

* Show a warning if DM 510 compiles without memory leak hack enabled

* Re-organize subsystems & MC defines a little

* Airlock SFX

* Log of Changes

* Make SSicon_update disable itself when not doing anything

* Fix respawn verb runtime when used early in server-init

* Add more information to MC's stat_entry()

* Replace direct refernces to gcDestroyed with QDEL* macros

* plant_controller -> SSplants

* More plant tweaks

* Add more humor to changelog

* Move parallax globals into SSparallax

* Lighting responsiveness tweaks

* Fix parallax init order & better MC init panel stat

* Make mobs GC

* More overlays + Remove intercom spawn()

* SSfast_process; make pinpointers not use spawn-recursion to process
Also made the SM Cascade beach process with SSprocessing instead of a spawn loop.

* Update changelog

* Mob GC tweaks

* Del() cleanup

* Fix insomniac ZAS connection edges

* Minor pAI cleanup

* Convert more things to SSoverlay; fix duplicated overlay in field gens

* SM Bluespace turf tweaks

* Update SSgarbage debug globals list

* Human-type qdel tweaks

* Subsystem suspension; stat_entry improvements

* SQL Statistics cleanup

* Fix runtimes with ambrosia

* More disable() -> suspend(); fix nightmode again

* Human qdel fix; minor tweaks

* Update turbolift to work with StonedMC

* Make lifts use timers instead of a subsystem

* Make SSassets start earlier

* Convert the radio controller into a subsystem

* Fix some missing CHECK_TICKs in asteroid generation

* MC stat tweaks; make shouldnt_see a typecache

* Kill some redundant debug-controller entries

* radio_controller -> SSradio

* Better SSgarbage hard-del logging from /tg/ upstream

* Logging tweaks + GELF

* Misc client caching improvements

* Slime SSoverlay

* Oven icon fixes

* Implant fixes
- Death implants will no longer spam Common on death of user.
- Death implants should handle a deleted user better.

* Holder tweaks + Welding tool Initialize()

* Fix some bad subsystem logging

* Fix suit cooling units spawning without cells

* Starlight tweaks

* Gibber infinite gib fix

* More SSoverlay stuff

* Make crates use CUT_OVERLAY_IN

* Make SSarrivals suspend instead of disable

* Make openturf use split/phased tick checks

* Speculative fix for unwet timer runtimes

* Blood overlay tweaks/fixes

* Update crusher to play nice with SMC + SSoverlay

* Openturf improvements and fixes

* Minor turbolift tweaks

* Lighting performance improvements + ChangeTurf tweaks

* this is probably important

* Fix wall weld noises on changeturf

* More ChangeTurf tweaks

* Explosion tweaks

* Pre-game lobby tweaks

* Openturf tweaks

* Prevent admins from starting the game before init finishes

* Fix Travis

* Kill an unused var

* Fix ChangeTurf runtimes on openturfs

* Fixes

* Browser datum fixes, asset caching

* Update changelog

* Changelog

* Lobby tweaks

* Ticker tweaks; kill ticker var

* Further lobby tweaks

* Cascade tweaks

* air_master -> SSair

* Reduce overhead from radio autosay

* alarm_manager -> SSalarm

* bomb_processor -> SSexplosives

* corp_regs -> SSlaw

* ZAS overlay fixes

* Small wall icon optimization

* Fix effects master

* Assembly tweaks

* Megavend fixes

* Shuttle fixes

* Camera alert performance improvements

* Fix some world.log spam from lighting overlays

* Fix some Initialize() procs

* Openspace responsiveness tweaks

* Make HE pipes animate through openturfs

* Kill a spawn
2017-05-02 14:40:40 -04:00
skull132
a5848c2802 Merge branch 'development' into map-development
# Conflicts:
#	baystation12.dme
#	code/game/objects/random/random.dm
#	code/game/turfs/turf_changing.dm
#	code/modules/mining/ore.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
2017-05-01 01:07:56 +03:00
NanakoAC
f09afbaeaa Cooking Fixes Pass 2 (#2024)
This PR is a package of fixes for a few cooking issues, and also (largely unrelated but its been annoying me for weeks) more fixing on the Flash issue.

Fixes the cooking sound not being set on cookers

Very thoroughly re-examines all interactions with cooking machines and their verbs, adds safety checks, alters contexts as intended. This gets rid of all the problems with mouse/ghost/AI fuckery.
Note that AIs can toggle the oven door and the power on cooking machines, this is by design.
Animals can remove food from exposed cooking containers, this is also by design.

Sets cooking containers to NOREACT, to prevent some issues with recipes being unmakeable because ingredients would become dough.

Tweaks oven heat loss a little more

Adjusts the mix flag on several potentially problematic recipes to prevent certain undesireable things ending up in finished products (like flour and eggs causing a lump of dough to be ejected from a finished cake)

Alters quite a few recipes which used a whole egg as an ingredient, to use egg yolk instead. Partly becase it makes more sense in context, and partly because cooking containers don't support adding whole eggs. There are now no fryer/oven recipes that need an intact egg.

Scales up plain bread to be a little closer to the other specialised breads in terms of reagent quantity.

Removes a redundant spellburger recipe because item checks use istype

And the flash issue:
For those who missed it, several months ago we had an issue with an object named "flash" appearing in the rightclick menu anywhere, for anyone with admin/dev powers. It was constantly annoying. After enduring the mysterious thing for months i found the cause, it's a hud element. Setting mouse opacity fixed it.

Anyways my fix wasn't comprehensive enough. Several other huds for non human mobs duplicate this thing. So ive set mouse opacity on them too
2017-04-13 23:31:32 +03:00
NanakoAC
f9e7a071c1 Alcohol additions and fixes (#2052)
Project partially commissioned by Senpai Jackboot.

This PR adds a new reagent, butanol. It is an alcohol intended for unathi consumption, intoxicating and safe for them. On other species it is also safe, but has a fairly minimal effect, and humans drinking it is generally a waste.
Butanol moonshine can be made in the kitchen by delinquent lizards.

Adds two butanol based drinks, imported from moghes.

Also adds a new Tajaran Gin, slightly weaker than a normal spirit. This is an ordinary ethanol drink with some kitty flavour text.

Kegs of beer and xuizi juice can now be ordered in cargo. Prices may seem low but they come in a non-returnable large wooden crate

Fixes several bugs with alcohol effects not wearing off.
While fixing this I ran into another issue, and the easiest fix was something i've been meaning to do for a while:
Added a verb for bluespace techs to toggle their god mode on and off.
Intoxication with god mode on is now essentially disabled. It was causing too many buggy effects. If bluespace techs want to get drunk for adminbus RP, they can disable godmode first.

Fixes #1748
2017-04-08 23:17:46 +03:00
Werner
59e7377798 UDP Logging (#1997)
This implements UDP Logging with GELF.
It will allow full text search over all the logs and attributes sent over GELF to the log server.
2017-04-01 23:47:00 +03:00
Alberyk
a998108216 Fix cake/pizza slices spawning without any nutriment (#1986)
-fix the slices of food spawning without food inisde the lunch box
-fix all the food New() procs not using full paths
2017-03-24 21:43:26 +02:00
LordFowl
358ebcb35c Fixes several bugs. (#1977) 2017-03-23 16:25:44 -04:00
Lohikar
dcf1b7d3ea Fix merge conflicts with mining changes 2017-03-22 17:54:52 -05:00
LordFowl
3c64b62c27 New Map Mining (#1935)
* Alpha Commit

* Alpha Commit

* Seconds

* Some Commit

* Final Commit

* Fixing minedrone synth ID

* Dance Fever

* Fixing Travis part 1

* Satisfying the demands

* Stuff

* Sub-final commit

* Sculpting update

* more sculpting. pr is 99% sculpting, in fact

* kkk

* brightness_off

* swjaugyuwvhuw
2017-03-22 18:14:37 -04:00
Alberyk
670adb46a2 Do not Nerf pylons, sadly, and other things (#1962)
-nerfed overall accuracy, and removed burst, of the scout rifle
-removed a fuckton of white space from nanacode
-should fix ipcs being stung by changelings at long last
2017-03-22 20:14:45 +02:00