cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,682 Commits 5 Branches 0 Tags
14ee1bccbb12bf9c85e859df1cf5ac2a328ae10c
Commit Graph

10927 Commits

Author SHA1 Message Date
Mloc-Argent
be8bffbc5b Ported code from /tg/station to make brig timer panels and status displays use maptext instead of expensive icon procs. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:13:39 +01:00
Chinsky
575acb73d1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into viro 2013-10-06 22:40:35 +04:00
Chinsky
732596805a Merge pull request #3734 from Baystation12/master 
Master -> dev
 2013-10-06 11:39:36 -07: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
4fa6316d39 Garbage collection for fire and explosive particles. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-05 23:25:41 +01:00
Mloc
87538d55a5 Merge pull request #3729 from SkyMarshal/airfixes 
More work on sleeping zones, fire fixes from master branch.
 2013-10-05 12:46:20 -07:00
SkyMarshal
8111178b6e Updates the zone-sleeping code to account for turf changes. 2013-10-05 12:38:33 -07: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
SkyMarshal
cffa100caa Reverted both LordBraindead and my own work on firecode back to when it was stable. Fixed some issue with phantom-fires-in-pipes. Removed some useless things left over from FEA. 2013-10-05 00:32:02 -07:00
SkyMarshal
eeb25f7b89 Reverted both LordBraindead and my own work on firecode back to when it was stable. Fixed some issue with phantom-fires-in-pipes. Removed some useless things left over from FEA. 2013-10-05 00:29:25 -07:00
Chinsky
f5d17f89f2 Changes to airlock opening: 
-Only people with engineering access can open them by hand.
-Crowbarring them open/close now takes some time (~3 sec)
 2013-10-05 10:12:46 +04:00
Chinsky
1ff9a20f68 Standartized definitions. 2013-10-05 09:16:56 +04: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
62ecc88a1f Fix for #3628 
Stops dead people from sending PDA messages.
 2013-10-01 00:30:12 +04:00
Chinsky
86715a423b Partial fix for #3697 
Would not carry over gutter and such, only species-specific languages.
Full fix would require moving languages out of mob into mind, and I am really lazy, this will cover 98% cases.
 2013-10-01 00:16:29 +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
2ad7bc8108 Fix for #3677 
Flags were set backwards AND on wrong var
 2013-09-30 22:13:26 +04:00
Chinsky
b80006da9c Fix for #3713, dev part 2013-09-30 21:12:22 +04:00
Chinsky
57497f9b12 Renamed file so defines go before they are used. 
<3 DM FOR IGNORING MANUAL DME EDITS LIKE THAT
 2013-09-30 21:06:42 +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
f956971fdf Small change to code. (Was locking up game ticker.) 2013-09-29 22:13:58 -07:00
ZekeSulastin
01201ce473 Made modules/detectivework and economy lowercase 2013-09-30 00:22:32 -04:00
ZekeSulastin
1d21cc7e55 Missed a couple 'color to item_color' in stamps.dm 2013-09-29 23:57:08 -04:00
DJSnapshot
1a48a2b6b0 Auto-transfer voting! 2013-09-29 12:05:10 -07:00
DJSnapshot
dda4080434 Bugfix for gamemode vote delay 2013-09-29 11:57:28 -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
DJSnapshot
caa6cd6c8a votes now show number of votes, no longer mute OOC, and show results. It is no longer possible to call a crew transfer during red/delta alert, and a new proc called autotransfer() has been added, but has yet to have anything to trigger it. 2013-09-24 23:41:21 -07:00
Chinsky
4b17be8215 Merge pull request #3693 from caelaislinn/accounts_updates 
Economy/Accounts updates
 2013-09-24 10:15:10 -07:00
DJSnapshot
a11f1d4bdb Hotfix for infinite mangling of gloves. 2013-09-22 13:10:14 -07:00
Kilakk
b5095646e2 Mining shuttle console now tells you if the shuttle is moving or not 2013-09-22 15:48:39 -04: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
Mark Aherne (Faerdan)
a2438f3e80 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-09-20 23:13:07 +01:00
Mark Aherne (Faerdan)
f9906ef76e Styling improvements for Chem Dispenser and DNA Modifier Nano UIs. 
Injector buttons are now disabled when the injector system is not ready.
 2013-09-20 23:08:04 +01:00
Cael Aislinn
955160e9d6 moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-20 13:35:49 +10:00
Mark Aherne (Faerdan)
1fe407f769 Updates to Nano DNA Modifier UI: 
* Fixed DNA block selection.
* Added change label button.
* Added Block Injector button.
 2013-09-20 01:02:08 +01:00