cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 05:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,943 Commits 9 Branches 26 Tags
ecd7df9628a7cd15662965b9482cfccebb5d94e4
Commit Graph

4156 Commits

Author SHA1 Message Date
mwerezak
ecd7df9628 Adds disarm effect for stun weapons and hands 2014-07-31 16:52:50 -04:00
mwerezak
56ccd4303b Merges taser and stun baton effects 
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm
 2014-07-31 16:21:22 -04:00
mwerezak
c8cccb64f6 Adds siemens_coefficient handling to stun batons 2014-07-31 15:38:56 -04:00
mwerezak
9bfb4642a2 Merge remote-tracking branch 'upstream/dev' into stun-baton 
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	Made all obj/item/weapons have "swing_hit" as their default hitsound.
	Made hitsound not play when the attack misses.
 2014-07-31 14:31:21 -04:00
mwerezak
a644156bdf Taser cleanup and fixes 
Fixes cloaking devices and deadman switches being included in taser code
somehow.
 2014-07-31 13:40:23 -04:00
mwerezak
7130fd124b Stun baton nerf 
Adds agonyforce var to stun batons, which causes halloss and eye blur.

Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
 2014-07-31 13:39:06 -04:00
PsiOmega
3ad8f4ca24 Merge branch 'dev' into Pics 
Conflicts:
	code/modules/paperwork/photography.dm
 2014-07-29 16:45:55 +02:00
Chinsky
fcdca5ca5b Merge pull request #5832 from Baystation12/master 
master - > dev
 2014-07-29 18:37:19 +04:00
Chinsky
1150331bc4 Merge pull request #5828 from mwerezak/wound-infections 
Fixes chest not being coloured by necrosis
 2014-07-29 18:13:02 +04:00
PsiOmega
2f8bb7e135 Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them. 2014-07-29 15:45:22 +02:00
mwerezak
9680cd85b7 Fixes chest not being coloured by necrosis 2014-07-28 20:51:04 -04:00
PsiOmega
a5f6d417a1 Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice. 2014-07-28 23:41:55 +02:00
PsiOmega
63ab44accc Makes it possible for the AI to take and view images. 2014-07-28 17:30:51 +02:00
Zuhayr
11a2b0eb3c Merge pull request #5792 from Whitellama/flavourtext 
Dynamic Flavour Text
 2014-07-28 10:11:02 +09:30
Mloc
d6caf74e56 Merge pull request #5769 from comma/dev 
Enables logging of people beating monkey
 2014-07-27 12:02:26 +01:00
Whitellama
eb64769734 Cleaned up mistake implementing dynamic flavour text 2014-07-26 17:41:03 -07:00
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
0528675846 Added dynamic flavour text, where covered bodyparts' flavour isn't displayed 2014-07-26 17:08:55 -07:00
Whitellama
bbc9150793 Updated body_parts_covered 2014-07-26 17:06:08 -07:00
Zuhayr
e5eb9cc496 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:24:27 +09:30
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Chinsky
c34cf89a04 Merge pull request #5784 from Jarcolr/patch-3 
Fixes #5691
 2014-07-26 17:18:38 +04:00
Jarcolr
9e233f1597 Fixes #5691 
Chef >> Chefhat
 2014-07-26 13:41:43 +03:00
Jarcolr
17f86962ac Fixes #5773 
Added /obj/item/weapon/FixOVein to surgery cyborg modules.
 2014-07-26 12:50:41 +03:00
Zuhayr
bc25cca7a9 Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics 2014-07-26 15:45:26 +09:30
Zuhayr
efe1c2feb2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:39:25 +09:30
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/client/preferences.dm
 2014-07-25 17:19:59 -07:00
Chinsky
1e1d5a6d01 Enables logging of people beating monkey. 
Also updates it to species code and visible message helper. Shit is anicent.
 2014-07-26 04:09:20 +04:00
Zuhayr
d8336061b4 Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev 2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
DJSnapshot
2c7bb6c48d Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request. 2014-07-24 17:01:52 -07:00
Zuhayr
61d38a3e86 Merge pull request #5740 from Ccomp5950/taser_slow_down 
Tasers will now cause movement slow downs on the first hit
 2014-07-23 17:46:55 +09:30
Ccomp5950
fe9785d630 Tasers will now cause movement slow downs on the first hit 
Before:  Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit.

After:  If you have any halloss you will slow down some.  I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly)
 2014-07-23 02:55:37 -05:00
Ccomp5950
98abc5bfc4 Compromise on speach_sound, will check distance instead of just checking if ghost. 2014-07-23 01:48:48 -05:00
Ccomp5950
477d32ff64 Ghosts will no longer hear clientless mobs random talking unless they are in view. 
Experiment 97B says, 'EHEHEHEHEHEHEHE!'
 2014-07-22 19:33:56 -05:00
Ccomp5950
75803c5140 Positronic brains (and every other mob) using binary chat will no longer send their messages twice. 
Fixes: #5444
 2014-07-22 19:32:52 -05:00
Ccomp5950
e01e081cbb screen_shake (meteors, etc.) made more robust and works with aiEyes 
Before:  multiple screen_shake's could queue up prior to screenshake being set on the mob setting
oldeye on the last one to queue up to be the random location from the previous screen shake
so sometimes peoples clients were stuck on a location instead of back on the mob.

Now we set screenshake before the spawn so we don't spawn up multiple screen_shakes on the same mob.

Test:  Be ghost, hammer the spawn meteors secret 10 times or so, watch as your camera returns back to your mob.

Yay.
 2014-07-22 19:05:04 -05:00
Mloc-Argent
3d390998f1 make gas mask filtering more generic 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-22 20:31:20 +01:00
Mloc-Argent
d5e9851b62 integrate XGM into the code 
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-22 19:52:12 +01:00
Mloc
a9bd931345 Merge pull request #5734 from Walter0o/borer_hotfix 
borer mindcontrol release hotfix
 2014-07-22 18:50:59 +01:00
Zuhayr
5feb5b8a93 Merge pull request #5726 from Ccomp5950/fix_antagHUD_mutiny 
Mutineers and Loyalist will now show up properly in antagHUD.
 2014-07-23 00:27:08 +09:30
Walter0o
a274cd7326 borer mindcontrol release hotfix 
forgot to remove this remnant ckey check
 2014-07-22 16:49:09 +02:00
Chinsky
3668cc5b1d Merge pull request #5718 from Walter0o/double_sleep 
fixes issue #5717
 2014-07-22 10:56:45 +04:00
Ccomp5950
e942ca258f Mutineers and Loyalist will now show up properly in antagHUD. 2014-07-21 15:36:08 -05:00
Zuhayr
60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
Zuhayr
811fc5f65f Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-21 16:30:01 +09:30
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30