Commit Graph

2265 Commits

Author SHA1 Message Date
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
oranges
b8ea267866 Merge pull request #31281 from vuonojenmustaturska/clowncult
Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
2017-10-05 11:54:45 +13:00
Jordan Brown
32050bed01 Moves laughter to the emote (#31276) 2017-10-04 13:19:18 -04:00
vuonojenmustaturska
f85d057593 Flat out removes /datum/reagents/process(), a top-5 proc by call volume 2017-10-03 23:29:04 +03:00
oranges
eda8f7f7df Log attempted injections as well as successful ones 2017-09-29 15:57:13 -05:00
oranges
5260bd97c7 Merge pull request #31064 from YPOQ/silverfriedfoods
Silver slime extracts create proper fried foods
2017-09-29 15:55:02 +13:00
YPO
2587535ccf Silver slime extracts create proper fried foods 2017-09-27 13:41:21 -06:00
AnturK
292638c209 Specifies one format of variable declaration for the codebase. (#30926)
* Removes occurences of var name

* Contributing note

* note fixup
2017-09-22 13:43:52 -04:00
oranges
d7b48a9d31 Merge pull request #30851 from Firecage/nopatchesonnonorganiclimbspleaseandthankyoumistergoof
Fixes it so patches do not work on robotic limbs.
2017-09-22 17:32:12 +12:00
oranges
3791f0b443 Merge pull request #30896 from ShizCalev/debug-text
Removes old debug text
2017-09-21 23:29:29 +12:00
ShizCalev
c06c63662b Makes magillitis affect all Hominidae. (#30841) 2017-09-20 09:05:03 -05:00
ShizCalev
39380d5b03 Removes old debug text 2017-09-19 18:56:39 -04:00
Emmett Gaines
76c08c601a New squeaky datum and plushes (#30710)
* New squeaky datum and plushies

new plush subtype
clown shoes, bike horns, and mice slightly changed to use the datum

* narsie and ratvar plushes

* fixes duplicate obj/item/attack_self()

and other misc requested changes

* moves the sounds into initialize
2017-09-18 12:49:03 +02:00
Firecage
a937eccb8b Fixes it so patches do not work on robotic limbs. 2017-09-18 05:22:47 +02:00
Cyberboss
08a3c4bd0d Merge pull request #30824 2017-09-17 21:08:12 -04:00
Ashe Higgs
78d9674f4d Adds some new drink functions, buffs Brave Bull (#30521)
* Adds some new drink functions, buffs Brave Bull

* Light holder object

* Cleans Tequila Sunrise if its light object is eaten

* QDEL_NULL

* Health clamp
2017-09-18 10:31:40 +12:00
shizcalev
81e5154a70 Various grammar fixes 2017-09-17 01:46:41 -04:00
ShizCalev
e679b62516 Varedit cleanup mk4 (#30794)
* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description
2017-09-17 00:11:18 -05:00
shizcalev
4f5658cfbb Cleaned up some decimal values. 2017-09-14 12:50:06 -04:00
kingofkosmos
a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02:00
msgerbs
d5b2bd1578 Fix crit-only healing to include softcrit (#30520)
With softcrit implemented, people are only unconcious in hard crit. This will no longer bring you out of crit as intended. This PR fixes that.
2017-09-09 16:28:53 -05:00
XDTM
c27a03faff Fixes vaccines (#30357) 2017-09-03 11:50:41 -03:00
Cyberboss
c55656f709 Merge pull request #30199 2017-08-27 19:27:40 -04:00
Cyberboss
c76c50a98b Merge pull request #30113 2017-08-26 11:35:14 -04:00
vuonojenmustaturska
d54fb51e47 bugfix
Fixes portable chem dispensers charging much slower than possibly intended, also fixes an exploit where RefreshParts() will always
2017-08-26 03:20:31 +03:00
Iamgoofball
e77dc1c217 I was gonna take off my plasma man suit, but then I got high. 2017-08-24 15:32:07 -07:00
Jordan Brown
685cc968a6 Merge pull request #30129 2017-08-24 16:38:36 -04:00
Jordan Brown
f88938bf62 Merge branch 'master' into containers 2017-08-24 16:38:24 -04:00
shizcalev
3010674b8b Adds magillitis, a toxin which gorillas monkies 2017-08-24 15:47:12 -04:00
kevinz000
169a950e7b Revert "Refactors forensics to a datum (#29542)"
This reverts commit 0a530cff9c.
2017-08-23 23:19:48 -07:00
shizcalev
892fc79c6b Replaced 0 for container_type with NONE define 2017-08-23 17:19:52 -04:00
MoreRobustThanYou
0a530cff9c Refactors forensics to a datum (#29542)
* ports plasmeme windows from /vg/

* Update window.dm

* It's the stairway to seinfield

* fixity fix fix

* See this code if you're wondering why I rarely get any sleep

* *scream

* now

* this is going to give me PTCSD - post-traumatic coding stress disorder

* *scream

* Improves forensics datum

* Meep.

* RA RA RASPTUIN... i'm not crazy, right?

* better

* I think it works... /s

* less compile errors

* Reduces compile errors to a much more managable 50

* shitcode.exe

* ehhh

* HEY EVERYONE, IT WORKS!!

* Make slide code less autistic

* blue skyyy

* no more bay forensics!

* IT  WORKS

* Remove EnforceSize, it isn't used.

* icon2html

* More bicon sutff

* eee

* aeee

* abc

* abc

* a

* abc

* e

* forensics check in initalize

* huh

* bleh

* Update _drone.dm

* Update _drone.dm

* Update _drone.dm
2017-08-24 09:08:22 +12:00
vuonojenmustaturska
a6dd2a380f Minor cleanup to chemistry/bar/virology machinery
* replace drop_item() patterns with transferItemToLoc()
* grammar consistency fixes
* replace "that", "the machine", "the beaker" etc. with the name of the actual object in question in chat messages
* replace the portable chem dispenser reagent tier list with a static one, it's immutable between instances and only used to fill dispensable_reagents
2017-08-23 21:35:23 +03:00
XDTM
28a5901170 You can now click on symptoms in the Pandemic to see their description and stats (#29866)
* You can now click on symptoms in the Pandemic to see their description and stats

* Threshold info

* NO WHITESPACE
2017-08-19 19:52:09 -04:00
Ashe Higgs
dfd642f861 Ports smart metal foam from FTL (#29963)
* Ports smart foam from FTL

* Adds foam grenades to the EngiVend

* Why are you doing htis?

* Stuff

* badoop
2017-08-18 23:05:37 -04:00
Mike Long
15a549c4cf Makes mixing meth dangerous again (#29968)
* Make Meth Dangerous Again!

* Makes the mob_react variable act like it's named.
2017-08-19 11:59:48 +12:00
Jordan Brown
641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
BeeSting12
6899ec420d Removes meth explosion syringes (#29912)
balance: The meth explosion temperature has been raised.

Being shot and exploded in under five seconds in a relatively easy to make manner is not fun for anyone.
2017-08-17 10:58:53 +12: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
Jordan Brown
d144c88fb5 Annihilates the colons! (#29812) 2017-08-15 12:49:35 -03:00
Kyle Spier-Swenson
f2cf4c2f5c [ready]Makes bIcon better (#29690)
Goonchat will use the asset cache, you now have to specify who to send the icons too.

Goonchat will now load icons in the background, displaying them once they load. this prevents the message from being delayed while the icons are sent.

Icons that aren't preloaded using the asset cache system will not render on ie8 clients. This is because of a ie8 bug that prevents changes on runtime created images from rendering.
2017-08-14 10:40:50 +12:00
Lzimann
58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
Joan Lung
413c70f711 Fixes Explosive Lattice blobs being way more fragile than they should be 2017-08-05 22:17:20 -04:00
Jordan Brown
6806607425 Merge pull request #29369 2017-08-02 09:45:05 -04:00
Jordan Brown
3ec4aec215 Merge pull request #29601 2017-08-01 09:37:28 -04:00
shizcalev
99624b8e74 further spellchecking 2017-07-31 23:09:08 -04:00
Cyberboss
f5f3758df3 Merge pull request #29288 2017-07-30 20:54:22 -04:00