cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 10:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,651 Commits 7 Branches 0 Tags
fe0e1ecfb65efbdd1069affe77a73c048a39f02c
Commit Graph

3075 Commits

Author SHA1 Message Date
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
Chinsky
65880df974 Clicking on storage boxes now properly puts stuff in storage. 
Stole fix from TG.
 2013-06-05 19:43:01 +04: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
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
Ravensdale
da2d99c5cb Eep, this is needed for Serithi's custom sprite, forgot one last ctrl-s 2013-06-03 13:47:08 -07:00
Ravensdale
c8f9864207 Fix: Engineering borg's 'Antique' sprite being invisible. Blasted caps. 
New: Rowtree's 'Lucy' Cyborg and Serithi's 'REMNANT' AI Core sprites implemented.

Tweak: Cult's conversion rune failure text tweaked so something a little more immersive.
 2013-06-03 13:32:44 -07: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
Mloc
77832af5ae Merge pull request #2940 from comma/whistle 
Whistle
 2013-06-01 07:45:56 -07:00
Chinsky
88f5a2a3b5 Added this sound as emote to borgs. 2013-06-01 17:20:13 +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
b2aeed8fba Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-01 08:26:43 +04: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
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
MisterBook
25d5600d19 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772

Attempting to merge with BEF
 2013-05-31 00:21:48 -05:00
MisterBook
06b7700086 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
 2013-05-31 00:09:00 -05:00
jupotter
0cc16379ec Do not let a mind in a posibrain if not searching 
Should fix the robot split-personality bug
 2013-05-30 13:55:44 +02:00
jupotter
73a9958f29 Do not change both key and ckey 
Changing both the key and the ckey causes issues #2856 and #2803
 2013-05-30 13:51:40 +02:00
Andrew Carroll
97836acb56 Add station time to AI, new_player Status tab 2013-05-30 04:38:18 -04:00
Mloc
4eb113341d Merge pull request #2871 from ciiol/bs-rtag 
Fix radio keys localization.
 2013-05-29 14:26:03 -07:00
Erthilo
3312490691 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-29 11:22:40 +01:00
Chinsky
40e63cbe32 Merge pull request #2885 from Ravensdale/master 
Cyborg sprites
 2013-05-28 22:17:13 -07:00
Erthilo
01ef589293 Fixes everyone being able to understand everyone else. 2013-05-28 23:53:49 +01:00
Ravensdale
62e43f2abf re-adding an accidentally deleted line 2013-05-28 12:07:22 -07:00
Ravensdale
b42aa26c1a Gives more sprites for cyborgs to use. 2013-05-28 11:13:33 -07:00
Ciiol
e7127b8343 Fix radio keys localization. 
Add cyrillic analogs of xeno language keys, just as other channel prefixes.
 2013-05-27 16:34:39 +06:00
Mloc
5f580c8417 Merge pull request #2855 from VitrescentTortoise/bleeding-edge-freeze 
Resizes lobby manifest window & Cult chant edit
 2013-05-26 14:57:33 -07:00
Mloc
420354d1dc Merge pull request #2860 from CIB/master 
Fix to event no-repetition code
 2013-05-26 11:40:42 -07:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2013-05-26 20:43:22 +02:00
Chinsky
c78f47c795 Merge branch 'bleeding-edge-freeze' into tentacles 2013-05-26 05:02:34 +04:00
Chinsky
13e2d8d793 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-26 05:02:07 +04:00
VitrescentTortoise
6f6731dab0 Resizes lobby manifest window 2013-05-25 16:53:07 -07:00
VitrescentTortoise
827e85c4c3 Properly sets husks' names to unknown 2013-05-25 16:00:22 -07:00
Erthilo
e2ea94d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-25 22:16:29 +01:00
Erthilo
4028172c98 Fixes mutantrace languages appearing as unknown for observers and also appearing as says rather than race specific word. 2013-05-25 22:09:41 +01:00
Erthilo
c2b84e0985 Fixes mutantraces (soghun, skrell, tajaran) losing languages when cloned. 2013-05-25 22:08:57 +01:00