cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,912 Commits 10 Branches 0 Tags
b51bc5e32219c3f200de939c599bd50dbc7d7cfc
Commit Graph

9768 Commits

Author SHA1 Message Date
MisterBook
b51bc5e322 Response Team still isn't ticked on. Dunno if it's ready. Re-re-uncommented. 2013-06-09 14:26:34 -05:00
MisterBook
a7b5bee81b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-09 14:11:28 -05:00
MisterBook
b835ab4bd2 Fix of breacher chasis to keep anyone but Ughanti from wearing it. 
Fix of gun suicide - lethal is lethal, nonlethal just hurts like a mother.
Despamming electrode resistance.
 2013-06-09 14:10:11 -05:00
Chinsky
7076db3caf Merge pull request #3011 from Kilakk/bleeding-edge-freeze 
ERTs can change their appearance upon spawn-in
 2013-06-09 00:30:53 -07:00
Zuhayr
8b518f5639 Sprites and equipment for a psychic villain wizard variant. Mental focus is fairly experimental. 2013-06-08 19:20:02 -07:00
cib
8c6b8add20 Weights the likelihood of command positions by your age. 
For most head positions, a good age is between 25 and 60, with ages towards the middle of that being even better. 25 because I figure for stuff like research, engineer etc. they'll want someone with fresh knowledge. Captain's best age starts at 35 though, due to that being an "old geezer job".
 2013-06-09 01:13:13 +02:00
Kilakk
5ca6c970fb Reticked and uncommented ERT 
It's time
 2013-06-08 18:52:41 -04:00
Kilakk
a5609c8150 Adds ability to change appearance for ERTs 
* ERTs can change their own appearance
* Fixed an if statement I goof'd
 2013-06-08 18:51:26 -04:00
Chinsky
7b0c4c85e8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-08 07:59:57 +04:00
Chinsky
e40140be03 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-08 05:55:42 +04:00
Chinsky
0c6f518422 Merge pull request #2990 from jack-fractal/bleeding-edge-freeze 
Android Clocks and Instant Messengers
 2013-06-07 18:30:55 -07:00
MisterBook
99e2afb6bc Response team is unticked? Dunno if it's ready or not, but will not commit while that verb is live. 2013-06-07 12:45:02 -05:00
MisterBook
b168f684bf Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-07 12:32:52 -05:00
MisterBook
e05a20ad6f Putting VOX back in. 2013-06-07 12:31:38 -05:00
Chinsky
76d1ddaa26 Merge pull request #2963 from Ravensdale/master 
Robot bug fix, synthetic custom sprites update and a rune text tweak
 2013-06-07 04:45:00 -07:00
Kilakk
faf5b86e49 Changed the way ERTs are selected 
* Ghosts get a pop-up thingy that asks them if they want to be
considered
* Ghosts that're antag-banned and/or jobbanned from security officer are
exempt
* 30 second timer because timers are !!FUN!!
 2013-06-06 23:29:15 -04:00
jack-fractal
29bffb0c20 Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-06-06 21:32:08 -04:00
MisterBook
05083f4f48 Creating parent class for swimsuits. 2013-06-06 20:24:25 -05:00
MisterBook
1246e985f3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-06 19:50:55 -05:00
MisterBook
8e401489e7 Making sure I don't break anyone else calling apply_effects. 2013-06-06 19:50:32 -05:00
jack-fractal
17b8a2dc8a - reverting a change I hadn't accounted for to the luminosity of the PDA's flashlight 2013-06-06 20:50:22 -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
Kilakk
d1faeac8d8 Adds emergency response team verb 
* Adds a verb for (b)admins in "Special Verbs" that lets you spawn in an
emergency response team a la deathsquid-button
* Spawned-in ERTs can choose their own ridiculous name
* Command alerts, because everyone loves those
 2013-06-06 17:04:49 -04:00
Chinsky
466f930e63 Merge pull request #2982 from Zuhayr/master 
Vox icons, stuff from master.
 2013-06-06 02:35:49 -07:00
Zuhayr
df75d25cb3 Map conflict, using BEF. 2013-06-06 10:40:22 +09:30
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
Chinsky
e22156aa8c Merge pull request #2981 from SkyMarshal/zas-cleanup 
Runtime fix.
 2013-06-05 14:54:32 -07:00
SkyMarshal
50735caf29 Runtime fix. 
ZMerge was trying to combine lists without checking for existence.
 2013-06-05 15:51:43 -06:00
Segrain
65893426ba Bumping into firelocks in exosuit. 2013-06-05 21:02:25 +03:00
Chinsky
57c1ebb285 Merge pull request #2977 from MagmaRam/master 
Fix for security belts not holding all seven items sometimes
 2013-06-05 06:21:47 -07:00
MagmaRam
ae697179c9 Fix for security belts not holding all seven items if the total combined w_class of the items is over 14. They should now be able to hold seven of any items that fit in them. 2013-06-05 20:14:11 +07:00
Chinsky
106d68c2d2 Merge pull request #2975 from meyar/master 
Map fixes and a PDA tweak.
 2013-06-05 01:38:17 -07: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
meyar
11ae345509 Nerfs the PDA flashlight to make the ACTUAL flashlight a viable option. 2013-06-04 18:34:43 -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
69e1cce5d3 Removed the commented out code from the auto update options of exosuit fabricators. 
For this reason, the exosuit fabricators will be removed from the process() list at roundstart.
(cherry picked from commit 8e191ebac99dc1f93b1b03a89784212f31f4b985)
 2013-06-04 14:03:32 +04:00
Aranclanos
82181e72fe Removed the auto-update from exosuit fabricates. They were huge lag generators, loops inside of other loops each process() tick. 
This will help to reduce lag.
 2013-06-04 14:02:38 +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
Aranclanos
799ed74a3c Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds) 2013-06-04 13:47:26 +04:00
rockdtben@gmail.com
8203e7dced Push sparks lag to GC this should greatly reduce lags. 
Test: 20 emitters shooting for 10 minutes. No lag. Along with other various tests.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5757 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-06-04 13:30:07 +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