cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,877 Commits 5 Branches 0 Tags
29bffb0c20f81d56b4d9ea83b3bca141b557345b
Commit Graph

5473 Commits

Author SHA1 Message Date
jack-fractal
29bffb0c20 Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-06-06 21:32:08 -04:00
jack-fractal
f4441b5019 refactoring the Stat function for silicon lifeforms 
adding messenger functions to cyborgs and refactoring the AI's IM system
 2013-06-06 20:46:46 -04:00
MisterBook
eab6f4fc44 Taser fix v.3.2 
Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
 2013-06-05 19:37:29 -05:00
MisterBook
a34174e124 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-05 18:39:43 -05:00
Zuhayr
06f04e6374 Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite. 2013-06-05 17:35:38 +09:30
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
MisterBook
f240edcdb8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-04 22:42:45 -05:00
MisterBook
fd8d61aa8b New taser fix is now in place. Rather than full deflection, armor mitigates the damage. Updates along all sorts of Clothing for minor mitigations to major mitigations. 
New define - AGONY. Used as an effect (Like STUN, WEAKN, etc) to cause HALLOSS. Allows use of HALLOSS projectiles without having to worry about them shattering windows/grilles. Future use? Torture tools, pain inducers for interrogation, 'Be Good' modules, Meme, etc.

HALLOSS now regens while standing up (2 per tick), and laying down (Resting, unconscious, paralyzed - 6 per tick). This fixes the 'real damage + HALLOSS = forever crit'.

Sticking a gun in your mouth (Non-stun, damage inducing) and pulling the trigger kills you.

Icon adjustments.
 2013-06-04 22:41:23 -05:00
Asanadas
29f2f4e7aa Quickfix for posibrain.dm , posibrains booting ghosts that try to join them. Credit to Zuhayr for the fix! 2013-06-04 21:44:42 -04:00
Asanadas
3be319a555 Merge pull request #2967 from comma/master 
Drugs and Surgery fixes
 2013-06-04 10:19:59 -07:00
Spamcat
c5a57ccdc4 Runtime fixes, tweaks. 2013-06-04 16:25:41 +04:00
Spamcat
b15738d5d4 Compile fixes. 2013-06-04 15:17:04 +04:00
aranclanos@hotmail.com
3035bf565c Changes on how some simple hostile mobs search for targets, they now make a list of mobs at sight with the heareable() proc and add the mechs of a new global list instead of checking all the atoms in a radius of 21x21. 
The new global list is called mechas_list, it contains all the mechs (sadly the 8 mechs of centcomm are added to this list, just to avoid problems with other servers with different maps)
Clowns, goats and spiders still use the old way to track targets (the view() proc).

The goal of this commit is to reduce lag, it will be really noticeable on the carp migration event, they should be 70% less laggy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5820 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-06-04 14:09:05 +04:00
Aranclanos
787565b424 SecHUDs and medHUDs (including pAIs and odyssesus) won't create a fuckload of images per tick and then disposal them, lagging like retards. 
Now each human will have a list of HUD images, that will be refreshed if it's required, say, a medic walking near you with a medHUD will refresh both medical images.
The list, called hud_list, uses seven defines for all the images, defined in the __DEFINES.dm

I also added a check for not rounding the health bar if the pacient it's dead, fixing some issues with showing dead people in critical or with possitive health.
 2013-06-04 14:00:40 +04:00
Chinsky
0ad08b13cc Fixes #2954 
Winners do no use Space Drugs to escape from cuffs.
 2013-06-04 13:14:51 +04:00
Chinsky
a0847aa567 Fixes #2964 
Now def_zone and tool are saved before sleep, to prevent changing them during it
 2013-06-04 13:08:21 +04:00
Chinsky
2ed4ddcd40 Merge pull request #2955 from Segrain/master 
Medical clothes.
 2013-06-02 16:35:40 -07:00
Segrain
a5766cbf29 Minor tweaks to medical clothes to match descriptions. 2013-06-02 23:07:25 +03:00
Chinsky
40e8d9b792 Fixes radium not producing cures for virus2. 2013-06-02 23:58:29 +04:00
Segrain
446ddbb108 Various things can be carried on hazard vests and EMT jackets. Code for #2932. 2013-06-02 22:40:20 +03:00
Mloc
6e65bc2558 Merge branch 'master' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-01 21:12:43 +01:00
Mloc
dd0e13c8fd Compile fix. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-06-01 21:11:41 +01:00
Mloc
73f0b22c42 Merge branch 'master' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-01 20:34:24 +01:00
cib
af8e3a9192 Fixed the issue of missing when hitting yourself. 2013-06-01 18:11:24 +02:00
Chinsky
ef7ca95743 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into lids 
Conflicts:
	html/changelog.html
 2013-06-01 18:53:02 +04:00
Chinsky
ceddb499d3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into organ 
Conflicts:
	html/changelog.html
 2013-06-01 18:48:09 +04:00
Mloc
13e6926771 Merge pull request #2939 from comma/surgery 
Surgery
 2013-06-01 07:46:28 -07:00
Mloc
77832af5ae Merge pull request #2940 from comma/whistle 
Whistle
 2013-06-01 07:45:56 -07:00
Chinsky
28b62d0207 Merge branch 'bleeding-edge-freeze' into organ 
Conflicts:
	html/changelog.html
 2013-06-01 18:33:58 +04:00
Chinsky
f728fedccd Set wound update accuracy to 1. 
In profiler results organ processing was like in the bottom. Time to bump it up.

Changed healing speed.
For some reason untreated wounds did not heal at all previously.
Now they do at the speed of 0.2 health per tick for one organ.
If wound is treated, 0.3 bonus is added, so overall organs can be healed up to 0.5 per tick with first aid.
If wound damage is over 20, 0.2 natural regeneration doesn't happen.
 2013-06-01 18:25:26 +04:00
Chinsky
275003afa8 Fixed indentation. 2013-06-01 18:20:59 +04:00
Chinsky
88f5a2a3b5 Added this sound as emote to borgs. 2013-06-01 17:20:13 +04:00
Chinsky
2cafa9f77b Merge branch 'bleeding-edge-freeze' into lids 2013-06-01 14:50:26 +04:00
Chinsky
3bbb250749 Added bloody footprints. 2013-06-01 14:30:05 +04:00
Chinsky
89fff29db1 Showed that huge proc in /atom what polymorphism' is. 
Now instead of huge condition line it's handled where it was supposed to be handled.
 2013-06-01 12:24:43 +04:00
Chinsky
0b9c904252 DRY BLOOD FOR THE BLOOD GOD. 
Blood will now dry up in around half an hour.

Also moved blood drip define out of disposals. WTF.
 2013-06-01 10:56:59 +04:00
Chinsky
5de37def3d Moved blood compatibility check to the related file. 2013-06-01 09:08:45 +04:00
Chinsky
b2aeed8fba Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-01 08:26:43 +04:00
Chinsky
4749d6016d Made syringe gun work with aiming system. 2013-06-01 08:23:38 +04:00
Asanadas
2d6bb6a768 Merge pull request #2934 from Baystation12/master 
Bleeding Edge gonna bleed.
 2013-05-31 21:12:37 -07:00
MisterBook
606a510168 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-31 22:58:01 -05:00
Chinsky
4794fc4d1e Merge pull request #2933 from Furlucis/master 
Fixes and tweaks for Obscure, Reveal and Seer runes, plus some amount of floundering around with git
 2013-05-31 20:09:10 -07:00
Chinsky
de4f4e4788 Merge pull request #2927 from Baystation12/master 
Merging master to BEF
 2013-05-31 19:49:13 -07:00
Chinsky
e630d11cea Merge branch 'master' into bleeding-edge-freeze 2013-06-01 04:35:30 +04:00
Chinsky
1030ddd8db Whoopsie! 
So awkward.
 2013-06-01 04:34:04 +04:00
Chinsky
b91cf84993 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-01 04:18:43 +04:00
Chinsky
793f472a4f Should fix quite a few of false positives on gun targeting. 
Allows mob to click on turfs with empty hand.
 2013-06-01 04:11:16 +04:00
Chinsky
1a51aefaac Fixes #2922 
Putting gun away now properly lowers aim.
Prevents gun from going off if it's not in active hand.
 2013-06-01 04:05:33 +04:00
Furlucis
e32b253a41 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-31 20:01:57 -04:00
Furlucis
0f9a1fe71c Fixes and a few tweaks to Obscure, Seer, and Reveal runes. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-05-31 19:42:27 -04:00