Commit Graph

10571 Commits

Author SHA1 Message Date
AnturK
b9bf27cdd1 Adds knockoff component to cigarettes 2017-12-19 11:43:36 +01:00
AnturK
8167cd2f8c Knockoff component 2017-12-19 11:43:36 +01:00
ACCount
40699a8aea [READY]Refactors reagent container types (#33470)
* Replaces a bunch of manual OPENCONTAINER checks with helper procs

* Removes unnecessary vars

* Updates reagent bitflags, adds some new ones

* Replaces most of the is_open_container calls with more specific ones

* Puts new AMOUNT_VISIBLE flag to use

* Uses new helper procs in more objects

* Standardizes chemicals logging

* De-snowflakes two more checks

* Fixes

* Minor fixes and improvements
2017-12-18 22:55:01 -06:00
Shadowlight213
d2d80e82c9 Removes syndicate door access from Captain's PDA cartridge. (#33635) 2017-12-18 21:18:45 -06:00
kevinz000
02254279fb Adds jousting (#33531) 2017-12-18 20:55:09 -06:00
XDTM
146d167189 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
* Refactors disabilities into lists, allowing for independent disability sources

* defines

* Xhuiiiiissss

* living

* did that

* adjusted for traumas

* Updates pacifism and removed remove_all_disabilities from fully_heal to prevent issues.

* makes antur happy
2017-12-18 22:20:07 +01:00
ShizCalev
c95fc8c78d Gun sounds (#33615) 2017-12-18 10:51:22 -05:00
coiax
f339b9f2c7 Lollipop dispensers can push lollipops into people's hands (#33419)
* Lollipop dispensers can push lollipops into people's hands

🆑 coiax
add: A lollipop dispenser in "dispense lollipops" mode can push the
lollipop straight into the targets hand, rather than getting it dirty on
the floor first.
/🆑

Also tidied up and around the robot_items.dm file.

This is a good idea because then you can give people lollipops as a
cyborg that has the lollipop dispenser module.

* Integers instead of numbers
2017-12-17 17:17:09 -05:00
Evsey Antonovich
ab1297d157 changes one letter (#33591) 2017-12-17 18:30:06 +01:00
XDTM
b5d9845edf [Ready]Brain Trauma additions (#33405)
* Brain Trauma additions

* Adds Aphasia

* Adds the aphasia language

* Short window

* nuke exploits GONE

* fixes draggable portals

* psychobrawl won't just kill you if you use it too much, but stuns longer

* Adds anosognosia, and lowers thresholds

* .

* RANDOM GODWOKEN

* Default brain damage is now 0

* antur

* fix 1

* forcemove and afk friend adjustments

* okay it's ready now

* dead people can hear imaginary friends
2017-12-17 18:10:25 +01:00
Emmett Gaines
25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
ShizCalev
d79d92e1ae Standardizes deconversion message (#33547)
* Standardizes deconversion message

* More cleanup

* Reverted tooltips

* Standardized all flavour_texts

* Cleaned up redundant classes
2017-12-17 12:49:42 +13:00
Tad Hardesty
71659b1e1a Tidy non-telecomms radio code (#33381)
* Remove extraneous parameters of receive_signal

* Delete unused signal datum procs

* Remove signal/var/encryption in favor of data

* Add and use datum/signal/New

* Clean up PDA and pAI integrated signalers

* Remove unused send_hear proc

* Clean up vars on obj/item/radio, change receive_range to can_receive

* Remove suffix var from radios

* Fix cell timer radios
2017-12-15 11:37:58 +13:00
nicbn
35090dce0d New closet sprites (#33207)
They're new sprites deal with it
2017-12-15 10:49:17 +13:00
Ashe Higgs
d447acdc6e All-In-One grinder results are now defined by type, not by huge lists (#33181)
I had some time free, and noticed how awful the reagent grinder code was - it used huge static lists containing types and their associated reagents from grinding.

This is now split into two new vars on /obj/item - var/list/grind_results and var/list/juice_results, as well as two new helper procs, on_grind() and on_juice() to allow those to change based on conditions like plant potency. Such checks and the like have been moved to that. If any of these procs return -1, the operation is canceled.

I also fixed some of the recipes that didn't work. The reagent IDs for them didn't exist, leading me to believe that they weren't tested. I corrected that! (I've tested every single recipe in this PR, with the exception of a few juicing-related ones.)
2017-12-15 10:48:25 +13:00
vuonojenmustaturska
5233ec1f6a Finishes the forceMove port (#33519)
* a thing

* thingy 2: electric boogaloo

* Obligatory webeditor commit
2017-12-15 10:39:34 +13:00
ShizCalev
0715bb9dea Adds new gun dry firing sounds (#33503)
* Adds new gun dry firing sounds

* Don't want to hear click when you want to hear bang
2017-12-14 07:14:36 -05:00
AnturK
e9175614b2 This is still pretty terrible (#33495) 2017-12-13 22:08:11 -05:00
vuonojenmustaturska
a162837faf Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)
* big batch of loc assignments

* Update emergency.dm

* Update spiders.dm

* Update parrot.dm

* Update ripley.dm

* Update firealarm.dm

* seems to work

* this maybe works?

* brainmemes, again

* stuff

* fix brainmob, camera runtimes
2017-12-13 20:56:39 +01:00
Jordan Brown
39fba08469 Merge pull request #33484 from vuonojenmustaturska/eminencefix
Fixes glass shard/bananium floor behavior for cameras and ghosts
2017-12-13 10:13:02 -05:00
Mark9013100
1caf3c6f8f Adds extra labcoats to medical wardrobe (#33467) 2017-12-12 15:26:20 -05:00
vuonojenmustaturska
37e8cd977d Fixed glass shard Crossed() behavior for cameras and ghosts 2017-12-12 17:43:46 +02:00
FrozenGuy5
0429c45b87 Corrects the icon_state for an oxygen tank (#33443) 2017-12-11 12:29:20 -05:00
uraniummeltdown
09be3e9b6b Airlock Construction Update (#33152)
* removed typetext and icontext vars from door assemblies, airlock painter no longer works on door assemblies
removed 'anchored = TRUE, state = 1' copypasta from door assemblies
door assemblies update their name more regularly during construction
added new airlock types to airlock painter on airlocks, and to the RCD
airlock assemblies built with metal are now in a list, you can build many more airlocks
vault door assemblies can be built with 4 plasteel
added a solid version of station2 airlocks, renamed to "public airlock"
glass and mineral sheets are now able to be welded out of door assemblies

* find n replace airlock/glass to airlock/glass_public in maps
door_assembly_glass to door_assembly_public

* made highsec airlocks built with 6 plasteel, removed from RCD and airlock painter
vault doors built with 8 plasteel
removed redundant vars in airlock_types.dm
reverts the dumb rglass 'replacement' addition in door assembly construction

* moved airlock assembly defines to construction defines file
fixed incorrectly named shuttle airlock glass_closed and maint panel protected closed overlays
improved examination message for glass/minerals present in assembly

* airlocks take their dir from the assembly when built from assembly
removed "vertical" variant of survival pod airlock, unneeded
survival pod airlock assembly can have glass applied
solid and glass overlays for survival pod airlocks

* OOPs some airlocks, removes a duplicate door assembly, removes some var edits on maps for a new glass type

* turn copied door assembly code into a proc
some feedback during door assembly construction
door assembly created airlock takes name from base_name if no custom name
moved plasma airlock proc to airlock_types.dm
2017-12-10 22:23:43 +01:00
oranges
ea2c37c67b Merge pull request #33276 from Cyberboss/FixUplinks
Restores the uplink modules, removes LoadComponents
2017-12-11 09:14:24 +13:00
Anonmare
d39fa67fda Fixes booze-o-mats not having booze (#33418)
* Update vending.dm

* Update vending.dm

* Update vending_items.dm

* Adds a missing close parenthisis

* I'm drunk and blind, don't sue me

* Update vending_items.dm

* Update vending_items.dm
2017-12-10 14:19:57 -05:00
coiax
165d53b0de Add caltrop component for spikey floor objects (#33280)
* Add caltrop component for spikey floor objects

The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.

This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.

Also, it taught me how components work.

* Code review I

* Caltrop damage is 4

* Cactus hurts

* Whoops

* Ignore restraints = true
2017-12-10 11:31:56 -05:00
oranges
728465e7c7 Merge pull request #33392 from vuonojenmustaturska/patch-1
[s]Ghost altclick fix for pet carriers
2017-12-10 21:53:19 +13:00
Jordan Brown
50a30a8f8a Merge pull request #33263 from kevinz000/patch-402
People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
2017-12-09 16:25:38 -05:00
Jordan Brown
dff4c8a862 Merge pull request #33241 from swindly/suicide
Adds some suicide acts
2017-12-09 16:22:00 -05:00
Dax Dupont
778f8570aa Prevents grilles from magically regenerating (#33357) 2017-12-08 19:24:35 +01:00
vuonojenmustaturska
e030d5dc2a Ghost altclick guard for pet carriers 2017-12-08 13:30:36 +02:00
Ashe Higgs
6e8401e112 Adds pet carriers (#33231)
* Adds pet carriers

* Some bugfixes

* praise the 1 AM code
2017-12-08 22:28:56 +13:00
kevinz000
b08c766372 Improves code 2017-12-07 17:51:34 -08:00
swindly
94f83561a8 fixes suicide acts 2017-12-07 16:27:29 -05:00
Jordan Brown
8c8eba8b94 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-07 13:50:09 -05:00
Tad Hardesty
51c7bdc007 Replace radio frequency magic numbers with defines (#33236)
* Change transmission_method to use defines rather than magic numbers

* Use MIN and MAX_FREE_FREQ defines when bounds-checking radios

* Remove violently broken "Debug Signals" verb

The relevant Destroy() is never called, making the static pointers list
take lots of memory and be large enough, even at roundstart, to crash
the chat when invoked (25k+ entries).

* Remove unnecessary checks for SSradio not existing

* Move department frequencies from GLOB to defines

* Replace all hardcoded radio frequencies with named defines

* Change the radio filters to be defines

* Use a define for the default signaler code
2017-12-07 14:58:27 +01:00
Leo
2851bf2c06 Merge pull request #33328 from octareenroon91/patch-55
Fix supermatter tongs icon bug
2017-12-07 10:21:54 -02:00
Jordan Brown
9460277ca0 Merge pull request #33316 from ShizCalev/games-vendor
Adds games vendor resupply crate
2017-12-06 23:52:30 -05:00
Ashe Higgs
32c68a60bf Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more (#32935)
* Adds the Eminence

* New abilities and a command system

* More stuff

* I did something in this commit but I dunno what

* Beginning work on trap setups

* This is good for now until arm gets his sprites

* I did something here!

* Manacle sprites

* R.I.P. R&D

* Maintainer review

* QoL, slabbin' it up

* Conflicts

* Conflicts

* <

* Now it compiles!

* TGUI

* TGUI, again

* 🥝

* that should be all, but I'll do some quick testing...

* aha!
2017-12-07 11:36:26 +13:00
XDTM
550d71167e Brain Traumas (#31727)
* Reworks Brain Damage

* mechanics

* rebalancing

* hulks in wheelchairs

* yup

* bugsquash

* Adds narcolepsy, phobias and agnosia. Not guaranteed 100% bug-free yet, testmerge at your own risk.

* lizard phobia

* Did you know there's a skeleton inside of you RIGHT NOW?

* Fixes for the new stuff

* The issue with those is that in most rounds you won't see them

I'll keep them available so they can be added manually, for example by events and such

* Goof reviews

* Brainloss is based off brain organ integrity

removes brainloss var

* Replaces some getorganslot with defines

* eyes

* put the traumas in the brainnnn

* text

* args

* Adds godwoken, puts split personality in severe, adds brainwashing

* Bluespace prophet special trauma (untested)

* Some minor stuff

* Monophobia, and tweaks

* More fixes

* fix

* a

* new tail

* Discoordination and Muscle Weakness

* thanks for the review!

* [B]oneless

* agnosia fix

* .

* go away agnosia

* pretend it didn't happen

* Shitcode-free-er

* bitwisdom

* psychotic brawling

* i guess this might be important

* latest reviews

* .

* conflict-free

* addresses it

* surgery fix

* a masterpiece

* fix

* fix again

* config

* damage formula reworked

* who needs to test anyway

* fixes some bugs

* fix 2

* proper spookin

* bluespace prophet fixes and improvements

* no bible healing

* .

* normalizes monophobia chances
2017-12-06 13:04:17 -05:00
deathride58
3265d09328 Nerfs criticism 2017-12-06 12:46:02 -05:00
ShizCalev
57f636b24b Adds games vendor resupply crate 2017-12-06 05:54:19 -05:00
octareenroon91
b1bc604075 Fix supermatter tongs icon bug
Fixes #33161
2017-12-06 00:36:25 -06:00
deathride58
1904080823 i fucked up - GLOBAL.DEFAULT_VIEW > GLOB.DEFAULT_VIEW 2017-12-05 21:53:52 -05:00
deathride58
b765f50302 makes the default view scale a config option 2017-12-05 21:44:56 -05:00
Jordan Brown
3aba012d67 Removes ComponentActivated in favor of callbacks (#33274)
* Removes ComponentActivated

* Removes a bit of proc call overhead

* Fix callback definition
2017-12-05 15:41:56 -06:00
Leo
2655d42770 Merge pull request #33262 from AutomaticFrenzy/patch/uplink-implant
Fix uplink implants not working
2017-12-05 19:39:16 -02:00
oranges
bf9f81bf7e Merge pull request #32751 from ninjanomnom/keybindings
In-code key handling system, Take 2
2017-12-05 22:15:13 +13:00
oranges
bd954fe780 Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
2017-12-05 20:42:25 +13:00