Commit Graph

3335 Commits

Author SHA1 Message Date
DJSnapshot
f020959710 Merge pull request #3833 from Nanai/dev
Cyborg Alt Titles
2013-10-27 17:34:35 -07:00
Nanai
87ac3c28f0 Added "Android" and "Robot" alt titles to cyborgs- They spawn with posibrains. Robot alt title waiting on an alt MMI/brain type from Ravensdale, but functions with posibrain right now. 2013-10-27 20:23:01 -04:00
Kilakk
aee7286e6f Merge remote-tracking branch 'upstream/master' into dev 2013-10-27 00:43:57 -04:00
Segrain
5698addc75 Code cleanup. 2013-10-24 09:54:15 +03:00
Chinsky
74f898a1a2 Merge pull request #3809 from DJSnapshot/antag
Fix for sunglasses and Night Vision Goggles
2013-10-23 21:58:44 -07:00
DJSnapshot
5f7ee54430 Fix for sunglasses and night vision goggles 2013-10-23 19:51:01 -07:00
Segrain
6655ae9b11 Wallets and cards. 2013-10-21 05:10:33 +03:00
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
Segrain
1d1d611087 Quillsfix. 2013-10-17 03:51:56 +03:00
Chinsky
41377d4122 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-10-15 10:59:06 +04:00
Chinsky
7c681b2bd8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/modules/mob/new_player/new_player.dm
2013-10-15 10:56:50 +04:00
Michael Johnson
e285ffd698 Fixed respawn timer issues 2013-10-13 10:35:15 -04:00
Segrain
bcba722bbd Fix for #3763. 2013-10-13 03:44:17 +03:00
Segrain
f725215857 Missing verbs. 2013-10-13 03:43:06 +03:00
Chinsky
fb0fb4da6a Merge pull request #3759 from Baystation12/dev-freeze
freeze -> dev
2013-10-11 11:41:06 -07:00
jack-fractal
6ecab0bc36 - implementing Mloc's suggestions.
- fixing the changelog
2013-10-11 13:29:33 -04:00
jack-fractal
32c3f27675 * adding a 'rejuvinate' function to organs that fixes all types of damage
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
2013-10-11 12:39:54 -04:00
Segrain
eb9a337d07 Merge remote-tracking branch 'upstream/master' into dev 2013-10-11 12:44:44 +03:00
Segrain
367c1cf4f4 Better check. 2013-10-11 11:10:27 +03:00
Segrain
775d723f68 Typecheck. 2013-10-11 10:21:14 +03:00
Segrain
17f38e109d Missing language. 2013-10-11 10:16:46 +03:00
Segrain
a4793fd208 Typo fix. 2013-10-11 10:08:04 +03:00
Mloc
3821fb2ab3 Merge pull request #3745 from comma/ghosts
Fancy ghosts!
2013-10-10 03:06:40 -07:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 22:01:16 +01:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00
Chinsky
463adc446f Fancy ghosts!
Now ghost will look like char preview / mob at moment of death.
Even MMIs have goasts now.
2013-10-06 16:10:47 +04:00
Chinsky
9000854ddc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into viro 2013-10-06 14:10:20 +04:00
Mloc
c79f33b932 Merge pull request #3732 from comma/sideeffects
Side Effects Strike Back
2013-10-06 03:09:29 -07:00
Chinsky
f53fa1dee2 Merge branch 'viro' of https://github.com/Mloc/Baystation12 into viro
Conflicts:
	code/modules/virus2/disease2.dm
	code/modules/virus2/effect.dm
2013-10-06 13:34:50 +04:00
Chinsky
784b98d151 Side effects overhaul.
Fixed cure message spam, now they do not remanifest while cure is still in system.

Changed yiming of side effects. They now start gatherping power only when their cause is no longer active. Around 180 ticks after that they start hurties.
This way they can be cured without either giving huge doses of cure (so they outlast the causing chem) or immediate remanifesting.
Because of way that loop works (and I am too lazy to think of other way, since ithis one is not that bad) you can only cure them when they are in active phase, so just adding cure to same pill won't do.

Also I axed out last damaging stages of side effects, since they are intended to be just an annoyance, not a disability.
2013-10-06 11:59:47 +04:00
Chinsky
f42631bdbe Adds contact-spread viruses.
Infection chance now calculated differently for airborne and contact ones.

Contact viruses spread on: infected people touching others, people touching naked infected people (clothed parts do not spread it).
Airborne viruses spread on: breathing (20% chance, then chance depending on worn clothing), coughing (now 2 tiles instead of 1)

Both types spread from mucous and blood puddles because lazy.

Fixes:
Blood and mucus now spread viruses correctly.
Lowered output of hyperzine generation syndrome, since it caused dedly ODs.
2013-10-06 08:49:51 +04:00
Chinsky
95c85e4059 Merge branch 'virofixes' into viro 2013-10-06 05:23:47 +04:00
Mloc-Argent
9ab11c0aeb virus fixes. WIP will update commit message later
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-05 18:52:08 +01:00
Chinsky
1f53ed0591 Merge pull request #3722 from Baystation12/master
Master -> Dev
2013-09-30 16:01:20 -07:00
Chinsky
82bd221aa3 Fix for #3667 2013-10-01 01:15:02 +04:00
Chinsky
8eb2f7db67 Fix for #3686
Thign now drops all stuff before turning into a tree.
2013-09-30 23:12:50 +04:00
Chinsky
b87669f592 Fix foe #3713
Megaphones will have to be fixed separately, since they are on dev branch.
2013-09-30 20:49:44 +04:00
Chinsky
92625f8384 Merge pull request #3716 from DJSnapshot/bugfix
Auto-transfer voting Redux: Episode 2.
2013-09-30 07:53:49 -07:00
DJSnapshot
6d3caf78a6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bugfix 2013-09-26 22:34:51 -07:00
DJSnapshot
8a83008e62 bugfix for custom AI sprites. 2013-09-26 22:32:23 -07:00
Mloc
49c0a30301 Merge branch 'master' into dev
Conflicts:
	baystation12.dme
	html/changelog.html
2013-09-26 10:26:03 +01:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500.
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-22 12:39:48 +01:00
Segrain
a24fd41829 Fixes for typos. 2013-09-19 08:37:29 +03:00
Segrain
0b661bc854 Fixes for stacks. 2013-09-19 08:34:38 +03:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
Segrain
91068e31c8 Falling fix. 2013-09-13 19:45:22 +03:00
Segrain
3dd5b22ae7 Fix for #3662. 2013-09-13 19:24:25 +03:00
SkyMarshal
92f389546b Removes the gas mask filtering stuff from gas mixtures. Moved it into the relevant "life" code. 2013-09-11 12:09:23 -07:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Zuhayr
161ec9ab98 Minor language token fix. 2013-09-09 21:52:23 -07:00