Commit Graph

6544 Commits

Author SHA1 Message Date
Chinsky
ac7aae7358 Fixed #3776
Missed update_body calls
2013-10-16 10:57:19 +04:00
DJSnapshot
4b8621bcef Temporary patch so aliums can use magboots until the hardsuit rework gets merged. 2013-10-15 23:06:02 -07:00
Chinsky
d85940ff3b Merge pull request #3775 from DJSnapshot/adminfeatures
expanded mod powers
2013-10-15 00:24:39 -07:00
DJSnapshot
3d83eafbae teensy spot missed. 2013-10-15 00:19:34 -07:00
DJSnapshot
8af4d1eadf Fixed random git bug 2013-10-15 00:14:21 -07: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
DJSnapshot
c7821741c2 Expanded mod powers to include temporary job bans, temporary global bans, muting, and subtle messaging. 2013-10-14 23:48:26 -07:00
Mloc
87037847ce Merge pull request #3773 from Aranclanos/EmitterBeams
Duplicates the speed of the gameticker!
2013-10-13 14:06:03 -07:00
Aranclanos
9af5c85c58 Duplicates the speed of the gameticker!
The emtiter beams were holding back the gameticker, 0.3 seconds per beam, now the sleep() is replaced with a spawn() instead.

This will add lag due to everything being faster.
2013-10-13 17:11:39 -03: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
3d6791df81 Fix for pockets. 2013-10-11 10:22:58 +03:00
Segrain
775d723f68 Typecheck. 2013-10-11 10:21:14 +03:00
Segrain
464fc22fa5 Missing verb. 2013-10-11 10:18:43 +03:00
Segrain
17f38e109d Missing language. 2013-10-11 10:16:46 +03:00
Segrain
8be67352ea Typo fix. 2013-10-11 10:16:00 +03:00
Segrain
a4793fd208 Typo fix. 2013-10-11 10:08:04 +03:00
Chinsky
7f62dfc5b1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/robot.dm
	code/setup.dm
2013-10-10 14:30:34 +04:00
Mloc
3821fb2ab3 Merge pull request #3745 from comma/ghosts
Fancy ghosts!
2013-10-10 03:06:40 -07:00
Chinsky
b96f9ef650 Merge pull request #3744 from Baystation12/dev-freeze
BYOND AKBAR
2013-10-10 02:45:45 -07:00
Chinsky
3c7c715e06 Merge pull request #3727 from fauxki/dev
Dev - Lightswitches for Medbay / Beach Holodeck Update
2013-10-08 21:23:42 -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
7555dd0f0b Merge branch 'master' into dev
Conflicts:
	code/setup.dm
2013-10-08 15:16:57 +04:00
Mloc-Argent
ebf2ba2d4a Fixes.
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-07 20:35:26 +01:00
Mloc-Argent
a71f5ec322 Holding down Alt or Alt-Gr and clicking a tile will now bring up a stat panel with everything in that tile listed.
Full credit goes to SuperSayu.
https://github.com/tgstation/-tg-station/pull/1402

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

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-07 20:24:21 +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
77d7cffa57 No idea why, but it caused all mobs spawn with deformed limbs. 2013-10-06 14:11:13 +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
e76721b6e8 Lowered immunity chance, it fires way too often with multiple viruses and such. 2013-10-06 13:25:23 +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
4d42a3a36d Changes to Shutdown Syndrome.
Now it only affects limbs.
Icon is changed to deformed to reflect it.
Dead limbs do not cause pain messages.
2013-10-06 09:04:41 +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
Chinsky
0cd28f9ca5 Bumped infection chance so viruses infect. 2013-10-06 04:23:24 +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
fauxki
a9de4f00f2 * Adds swimming fins, flotation ducky belt, and snorkel to code. Two of the fins and snorkels will spawn in the athletics closet with the swimming suits. The flotation device spawns on the beach holodeck. 2013-10-05 08:25:03 -07: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