Commit Graph

84 Commits

Author SHA1 Message Date
AnturK
4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
Ashe Higgs
7c38e7eac3 Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-26 09:50:16 +13:00
81Denton
5e93a1a1a9 Renames various reagent IDs to be more descriptive (#35824)
* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION
2018-02-21 12:36:05 -05:00
ShizCalev
3cb6ab32d2 Cleans up some duplicate canusetopic warnings 2018-02-11 09:56:43 -05:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456)
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
2018-02-11 16:06:12 +13:00
vuonojenmustaturska
2871b70733 /obj/item var cleanup (#34909)
* draft 1

* Update energy.dm

* Update twohanded.dm

* Update weaponry.dm

* Update ninja_stars.dm

* Update cult_items.dm
2018-01-25 22:44:32 -05:00
vuonojenmustaturska
6406896df1 Replaces a bunch of obj vars (and emagged on machinery/items) with obj_flags (#34078)
* It works, but is it worth it?

* bitfield helpers take 1

* Would this work?

* remove dangling debug code

* rebase & fixes

* vv bitfield stuff, reading

* DNM oceans of shitcode DNM

* honk

* honk2

* plonk

* rebase & fix
2018-01-22 20:19:46 +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
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
kevinz000
beb255dbf1 Refactors uplinks to a component 2017-11-20 00:13:26 -08:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
FrozenGuy5
5294c48be1 Adds alot more initialize() part two 2017-11-12 10:56:33 +00:00
FrozenGuy5
de0d93467e Adds alot of initialize() in lots of files 2017-11-11 20:58:15 +00:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
ShizCalev
d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Really-Good-Soda-Flavor
40de86de35 Moves reskinning items to /obj (#28558) 2017-06-21 15:19:17 -03:00
Expletive
fe73e0e920 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. (#28382) 2017-06-16 22:12:10 -03:00
AnturK
ac0ee0f317 Removes poison pen. 2017-05-28 20:16:10 +02:00
Iamgoofball
cad3c194a7 The Syndicate has fired their chemist and hired a replacement. (#27710) 2017-05-27 11:47:47 -04:00
ExcessiveUseOfCobblestone
7b34c5e20f AFTER A MILLENIA 2017-03-16 18:15:33 -04:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
AnturK
54c51a5510 Poison Pen (#23778)
* Poison Pen

* Fixup

* Logs

* Fix & proper name
2017-02-12 14:17:47 +13:00
Kyle Spier-Swenson
b5a3ba9133 Shitty ideas thread: 1. Traitor Uplink spawn location is now a Pref! Choose between PDA, Radio and all new: Pen! (#23190)
* 1. Traitor Uplink spawn location is now a Pref! Choose between PDA, Radio and all new: Pen!

* reeeee
2017-01-31 21:52:07 +13:00
Firecage
50bbf5aa50 Allows syringes and droppers to show their reagents when examined while wearing things such as Science Goggles. (#22618)
* Allows syringes and droppers to show their reagents when examined.

* rearranges my logic

* replaces SEMIOPENCONTAINER with TRANSPARENT

* Silly spelling error fix.

* Moves the defines from flags to container_type to avoid issues with conflicting flags

* changes it back to obj/item/O

* Moves the OPENCONTAINER and TRANSPARENT defines to the reagents.dm
2017-01-04 20:00:46 +13:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Joan Lung
4cddd81120 Suicide now uses the pronoun helpers (#20973)
* This doesn't actually matter, because you're dead forever once it happens...

* is this entire pr chaff for something else

* you'll do it? nah, fuck that I'll do it
2016-10-18 14:36:38 +13:00
LatD
502249831d Syndicate origin tech changes 2016-05-18 20:12:01 +03:00
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
octareenroon91
c183c660fc Typo in four-color pen feedback
Change message starting, "pen will now write..."
Now it starts grammatically correct: "The pen will now..."
2015-11-18 16:36:42 -06:00
octareenroon91
5b429cf2fe remove commented-out code from pen.dm
fine
2015-11-17 18:43:40 -06:00
octareenroon91
33350bffe6 Four-color pen code improvement.
Take advantage of inheritance; use defaults instead of New()
2015-11-17 13:07:22 -06:00
octareenroon91
4a5cda8a8b Introduce the four-color pen
Add a fancy pen that lets you choose between black, red, green, and blue ink.
2015-11-16 20:14:30 -06:00
AndrewJacksonThe2nd
2d307e330e makes sleepypens refillable 2015-11-02 17:41:35 -08:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Miauw
f64f1e2967 Reverts the revert properly instead of unreverting it unproperly. 2015-08-16 12:55:09 +02:00
Miauw
e8c39e2d07 Merge branch 'master' of https://github.com/tgstation/-tg-station into alanedaggerpoe
Conflicts:
	code/modules/paperwork/pen.dm
2015-08-16 12:00:04 +02:00
Miauw
efb5226784 ayy lmao i forgot that pens overwrite attack() 2015-08-16 11:54:47 +02:00
phil235
8a4f8a4482 Revert "Adds 15-force edaggers that look and function like pens when off." 2015-08-16 00:36:08 +02:00
Miauw
37dc7e0e3c Adds 15-force edaggers that look and function like pens when off. 2015-08-14 14:07:10 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
MrStonedOne
a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
phil235
3c6607ad19 Fixes sleepy pen having enough morphine to trigger the overdose message, making it not stealthy. morphine amount reduced from 30 to 20u. 2015-06-25 00:30:09 +02:00
Ikarrus
3b326a973b Additional Changes 2015-06-22 22:29:51 -06:00
Ikarrus
8eba1d09bf Gang Update: Recruitment Edition 2015-06-21 00:04:36 -06:00
Cheridan
470f21a752 Merge pull request #10004 from Ikarrus/gangimplants
Gang Update: Loyalty Implant Edition
2015-06-18 10:41:15 -05:00
Cheridan
6b6ffe0314 Merge pull request #9972 from Dorsisdwarf/sudoku
Adds a suicide_act to pens
2015-06-16 13:39:37 -05:00
Ikarrus
210cc17d5c Loyalty Implants and Gang Mode
Security treating gangs like revs has had a very negative impact on the experience of gang rounds. With an easy and convenient deconversion method, gangs are easily stomped as they rapidly run out of members to convert. So I'm going to try something different and see how things go if implants in gang mode acted as they are in cult.

- Implants can still prevent conversion, but can no longer deconvert or identify gangsters
- If a recruitment pen fails, the error message the gang boss receives will distinct loyalty implanted individuals from enemy gangsters.
2015-06-15 21:39:21 -06:00