Commit Graph

75 Commits

Author SHA1 Message Date
Wizardcrying
6ea0489065 Spelling/grammar/wording/etc fixes (#12993)
* mainly standardized the vending machine descriptions with exceptions

* oops

* more

* this time i changed a proc name but there was only one use of it

* everything gets changed!

* this commit sponsored by low-quality forum posting

* buisness

* i broke it

* but is it really robust?

* why didn't this commit

* finally, spent a lot of my morning for this

* colour

* sure it's not atomic, celt
2016-12-23 06:01:09 -05:00
9600bauds
2b0160ed9d Adds clothing_flags to unfuck & unclutter flags (#12720)
* Unclutters flags via clothing flags

* Update boxing.dm

* NO_COMMIT_MSG
2016-12-22 09:08:27 +01:00
Probe1
cc74361797 Taxi tribute Vault (#12916)
* taxi engineering vault initial commit

* saving progress, major issue with flunky apcs

* Mostly done.  APCs, Cameras, fixes, applying more damage, few things left to go.

* Clean up, changes galoshes into child type without no slip, removes bartenders shotgun.

* Re-arranging the deck chairs on the Titanic

* Pathing

* Adds a DEAD SPOIDAH
2016-12-21 22:23:28 +01:00
9600bauds
90839ea142 Adds (preloaded) boot knife holsters to Mining vending machines (#12748)
* Adds (preloaded) boot knife holsters to Mining vending machines

* Fucking sweet skinning knives

* dmi confrictu

* adds a spriting equivalent of shitposting
2016-12-21 08:51:49 -05:00
DrCelt
5078315282 Fixes #6299, chameleon noslip shoes not squeaking when set to clownshoes (#12800) 2016-12-18 17:55:49 +01:00
Skullyton
f26d4dbbb9 Adds new virus effects, adds virus say handling (#12496)
* Adds new virus effects, adds virus say handling

* Removes fun

* Slap it with standards

* Soon?

* Removes magic numbers, adds rounding, fixes shit
2016-11-09 14:28:15 -08:00
Intigracy
31a66103af weakened becomes knockdown (which is what it does) (#12466)
* weakened becomes knockdown

* CRUISE CONTROL FOR COOL

* there's a proc for that

* use the procs luke

* shitcode
2016-11-06 14:41:50 -06:00
invoid9
a9da551b7b Periods added to clothing descriptions (#12236)
* Fixes cryo indicating people as dead when at 0 health

* revised
2016-10-16 17:40:31 -05:00
kolith
44a6168f9e adds engineering workboots (#11574)
* pumped up kicks

* they better run better run

* revision
2016-08-29 05:42:41 -05:00
clusterfack
1b9fe86efb Spells (#11469)
* Spells 1

* Barely functional, but more converted than before!
Now with more coderart!
Some bullshit to let you use charges and holder var at the same time!

* Renames plasma storage variable
Makes it so xenos once again get verbs and spells added on new()
Changes some code around so you can have holder var requirements and recharging time requirements

* AHHHHHHH FUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUCK

Fixes a bug with spell channeling switching
Makes it so plasma DOESN'T USE ADJUST TOX LOSS TO ADJUST ITSELF
RECODES CONJURE SO IT HAS A SPELL FLAG TO NOT PLACE DUPLICATE
**MAKES IT SO THE FUCKING CONJURE DOESN'T HAVE A WELDER SOUND FOR NO REASON FOR EVERY CHILD**

I DONT EVEN KNOW WHAT ELSE CHRIST

* WATAFAK

* readds screen spells

* Fixes more conflicts

* New sprites

* Removes Unacidable
Final pass on corrosive acid
Converts regurgitate to spell

* Final revision before testing and completion

Creates alien spellmaster

* More things

* Some spell master stuff and bugfixes

* Finishes the code, fixes the bugs, removes unacidable from fucking defficiency

* FUCK YOU DEFFICIENCY, FUCK YOU AGAIN

* This is more reasonable

* Arbitrary balance changes ahoy

* Resolve issues
2016-08-24 09:05:13 -07:00
kolith
0485cf1d91 cheeki breeki cargo crate komrade (#11492)
* Adds everything + crate

* fuck you _s

* jhsajdahjkdaHKADDASS

* cl

* this is final

* 225
2016-08-23 15:26:15 -05:00
Exxion
f076b50c62 Adds some footprint types (#11429) 2016-08-15 05:50:38 -05:00
ComicIronic
b2b5c81633 Moved research names over to defines. (#11424)
* Moved research names over to defines.

Also fixed 4 (four) instances of the incorrect research name being used.

* Changed research names to avoid collisions.
2016-08-14 17:47:22 -05:00
9600bauds
521facfa4d Adds boot knife holsters, biogenerators can make holsters (#10869)
* Adds boot knife holsters

* compile

* Unified accessory attaching to remove copypaste

Also fixed a holster message displaying "This the"

* Adds sprites
2016-07-10 15:16:46 +01:00
unid15
adad10e4d8 Audible coughs (#10737)
* Audible coughes

* that's not how it's spelled

* that's not how it's spelled PART 2

* Fixes

* Aaaa

* New cough_m4.ogg

* Rename a variable
2016-06-29 19:08:56 -05:00
Konater
b4a6662aca Defficiency Wizard Den Change (#10072)
* round two

* I forgot to patch a hole

* PURPLE
2016-05-23 14:35:30 -05:00
ihadtoregisterforthis
11c07b598a Adds a New Whitelisted Special Race (#9799)
* rebase

* This is going to conflict very soon

* This broke

* makes spawning skelevox werk

* Inheritance magick

* 45%

* And a partridge in a pear tree
2016-05-14 18:43:17 -05:00
PJB3005
f46f02dc9e Goon-style chat.
Credits to goon for most of the work.
2016-03-27 17:23:07 +02:00
Shadowmech88
c4a7ed939b Clown goblins can be created by combining clown shoes and a clown mask. Clown goblins can be renamed by using a pen on the goblin. 2016-03-22 21:07:52 -05:00
unid15
2b060d322c You kick me down but I bite back
Attacks

talons and magboots

missing icons, legcuff check

meme references, magboot stomping toned down

ops

f

remove magstomp from vox magboots

p

do indows properly

hotkeys, cl

vox can bite silicon

Fix inconsistencies and typos
2016-02-25 11:47:34 +01:00
DrCelt
7a53e68fae Merge remote-tracking branch 'origin/Bleeding-Edge' into Hypothermia
Conflicts:
	code/datums/diseases/advance/symptoms/shivering.dm
	code/datums/diseases/advance/symptoms/vomit.dm
	code/datums/diseases/cold9.dm
	code/datums/diseases/fluspanish.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/cult/cult_items.dm
	code/game/gamemodes/wizard/spellbook.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/cryo.dm
	code/game/machinery/machinery.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/modules/clothing/gloves/color.dm
	code/modules/clothing/gloves/miscellaneous.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/head/jobs.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/colour.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/clothing/suits/utility.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/projectiles/projectile/special.dm
	maps/defficiency.dmm
	maps/metaclub.dmm
	maps/tgstation.dmm

fixes #7746
2016-01-19 01:37:20 +00:00
PJB3005
1a2f9ab059 All the EOLs are now LF.
Fuck you too 0D :^)
2016-01-16 23:28:07 +01:00
DrCelt
8d66aa7bf0 HYPOTHERMIA [DNM]
-Addresses #7158
-removes useless variables heat_protection & cold_protection as these were in 99% of circumstances the exact same as body_parts_covered
-added a new variable, heat_conductivity to all items, determining how fast they conduct heat away from you
-added new procs to humans, sweat() & burn_calories() - Now whenever you use up nutriment, you generate heat, but can also expend nutriment to decrease heat.
-refactored how heat transfer away from humans worked
-added mild hypothermia
-added moderate hypothermia
-added severe hypothermia
-added profound hypothermia
-removed damage from extreme cold
-space is no longer cold to humans (because it isn't, duh.), this does not affect atmos.
-upped pressure damage as space is no longer cold.
-probably a bunch of other stuff:
TODO: Macrowave, balancing of things that use cold to kill.
2016-01-10 04:15:30 +00:00
9600bauds
2e7d19ee5c If I rebase, noone can see my shit commit names
Oregon Trail 2: Return to Mississippi

look at me, clusterfack would be proud

Makes the Seed Extractor not awful

Squashes a couple of bugs with seed diverging and plant cuttings, removes unused variables.

Xenobotany & Shit

fak u

(B) HATE CONFLICT

Break Deity's fix again because clusterfack said so

like my old grandma used to say, "remember to commit often with descriptive commit names"

I SURE CANNOT WAIT TO FIX CONFLICTS ON PACID FOR THE FOURTH TIME

The Changelog Is Here

I have done as thy asked

remember to test your shit!

thank you for testing!

wait a sec this doesn't fire on process() anyways

Glowy plant no hate glow

SOIL IS NOT MACHINE

Fixed bio-lum fruits not glowing, added harvesting kudzu with plant bags, kudzu will only grow when mature

Push my Face into the Sun

I forgot about this

Thank you anonymous person
2015-12-13 16:44:47 -03:00
PJB3005
99bf59d80e Adds a to_chat() proc, to pave the way to a non shit chat. 2015-11-25 15:55:15 +01:00
PJB3005
3cca5692af Removes the panic writer messages. 2015-11-20 03:17:06 +01:00
DrCelt
ec46635765 I fixed your "mistake" mate. Happy? 2015-08-11 01:33:37 +01:00
DrCelt
7f3322376c as null|anything and fixed the other thing I hope 2015-08-11 01:19:30 +01:00
DrCelt
dff5c40528 Fixed a bug. 2015-08-11 00:33:31 +01:00
Arthurdentist
896a3a3231 Magician Outfit 2015-08-06 23:13:45 +00:00
ComicIronic
3d9e56d7b9 Merge pull request #5166 from Unfit/einatherino
super clown shoes
2015-07-26 13:18:14 +02:00
D3athrow
d59f6a07b0 comment out panicwriter and saytesting 2015-07-20 16:04:48 -05:00
Unfit
14eaf64569 21 2015-07-20 16:08:34 +02:00
Unfit
3438759fe7 my shit never compiles without errors 2015-07-20 15:51:34 +02:00
Unfit
3a8c1fd0ae honk
less silly code
fart sound
random sound option
2015-07-20 15:50:15 +02:00
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
PJB3005
6f03e48d95 Fixed 2015-07-11 22:58:16 +02:00
clusterfack
09e9dcdc05 Purges Ninja and its snowflake/badcode
Removes basically any and all active references to the ninjacode. A fresh slate if we were to port ninja code from someone now.
2015-07-03 13:05:40 -05:00
Unfit
61e81bd870 mechstep sound 2015-06-27 21:24:51 +02:00
Unfit
bf1a69e645 Honk
secret feature
2015-06-27 20:21:38 +02:00
DeityLink
f21e8af788 doomguy and cleanup 2015-05-16 10:26:31 +02:00
NigglyWiggly
79828694bd Tons of shit that's probably gonna break everything
Now if only I could do fucking anything with head.dmi
2015-04-05 19:04:23 -04:00
Arthurdentist
6a2348d0f8 Add's Jacket's Outfit and Biker's Outfit
Jacket's Outfit and Biker's Outfit added to the game
Jacket's Outfit is not accessible anywhere yet but Biker's Outfit can be
found as part of a syndicate bundle.
2015-03-18 06:08:14 +02:00
Arthurdentist
6fd19f83a2 Adds two new costumes to the theatre vendor
Now with less merge conflicts!
https://github.com/d3athrow/vgstation13/pull/3172/files
2015-03-02 16:57:56 +02:00
D3athrow
be5bff1a2a bad args man
infinite loop mang
two more funtimes squashed.
2015-02-23 23:38:30 -06:00
D3athrow
0dd1896c33 chameleon galoshes. 2015-02-12 14:59:55 -06:00
ComicIronic
dccd3ce3c5 Flag spelling fixes.
Why is PROTECTION PROTECITON?
Also DMAGE is now DMG.
2015-01-29 22:28:14 +00:00
Arthurdentist
2a77bf25f9 Jester
Adds Jester as an alternative job title for clown and adds a Jester
costume to the theatre vendor
2015-01-17 07:37:06 +02:00
eswordthecat
9c60cb0d05 oops 2014-12-28 05:26:46 +08:00
eswordthecat
7e027216cd Shoes actions from tg. 2014-12-28 05:24:33 +08:00