cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-06-06 05:54:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 8 Branches 26 Tags
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

12971 Commits

Author SHA1 Message Date
Chinsky 45e0f1b233 Merge pull request #9859 from mwerezak/bucklefix 
Fixes #9624
 2015-06-20 01:00:48 +03:00
PsiOmegaDelta 22d0f6ab83 Compilation fixes. 2015-06-19 10:25:43 +02:00
PsiOmegaDelta 1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml
 2015-06-19 10:19:08 +02:00
PsiOmegaDelta f5da9f70c5 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	config/example/config.txt
 2015-06-19 09:55:48 +02:00
HarpyEagle ccb12556d6 Fixes #9624 2015-06-18 16:31:29 -04:00
Ccomp5950 eea423ce0f Merge pull request #9857 from GinjaNinja32/bot 
Adds support for bots which use world.Export() for server-to-bot communication
 2015-06-18 13:46:50 -04:00
Ccomp5950 7ee7cafbff Merge pull request #9846 from GinjaNinja32/irc 
Allows setting the URL for the IRC bot to report separately from the main SERVER config setting
 2015-06-18 13:46:32 -04:00
GinjaNinja32 8d232e9304 Adds support for bots which use world.Export() for server-to-bot communication 2015-06-18 18:34:55 +01:00
HarpyEagle 44644d34b4 Restores stop drop and roll time 
Returns the duration of stop drop and roll to 3 seconds. The amount of
removed fire stacks was reduced by ~3/5 instead of lengthening the time.
 2015-06-18 12:55:31 -04:00
HarpyEagle 5c1499ff1f Merge remote-tracking branch 'upstream/dev-freeze' into stunrevolver 2015-06-18 12:54:43 -04:00
HarpyEagle 4b441bc293 Adjusts animate_tail_once duration 2015-06-18 12:53:20 -04:00
Hubblenaut 5a026b1553 Overhauls berets, adds corporate black 2015-06-18 18:10:35 +02:00
PsiOmegaDelta 341b29c34a Merge remote-tracking branch 'upstream/dev' into 150614-MakingYourLifeEvenEasierApplyDirectlyToForehead 
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-06-17 16:10:26 +02:00
PsiOmegaDelta 6ed7cee041 mob/living/Life() now handles even more regular hud updates. Relocates action handling. 2015-06-17 16:09:13 +02:00
PsiOmegaDelta 9d38bcc149 mob/living/Life() now handles regular status updates. 2015-06-17 16:01:26 +02:00
HarpyEagle b26edd690c Certain sidearms now use the lighter gunshot sound 2015-06-17 09:59:40 -04:00
HarpyEagle 1ba777f670 Reverses stunrevolver buff 2015-06-17 09:59:39 -04:00
PsiOmegaDelta d4b2fb7176 mob/living/Life() now handles regular hud updates. 2015-06-17 15:47:24 +02:00
PsiOmegaDelta b98d64b668 mob/living/Life() now handles processing grabs. 2015-06-17 15:41:25 +02:00
PsiOmegaDelta 225ed82c1c mob/living/Life() now handles can move. 2015-06-17 15:38:53 +02:00
PsiOmegaDelta 838739c4ed mob/living/Life() now handles updating pulling. 2015-06-17 15:35:41 +02:00
PsiOmegaDelta 9887f16135 mob/living/Life() now has basic gravity handling (no overrides). 2015-06-17 15:32:23 +02:00
PsiOmegaDelta c8b7a77399 mob/living/Life() now handles stomach contents. 2015-06-17 15:19:41 +02:00
GinjaNinja32 078cfb2533 Merge pull request #9774 from mwerezak/chem-touch 
Reagent splashing, mob fire
 2015-06-17 10:05:11 +01:00
GinjaNinja32 a60b91fd1b Adds a new configuration value, SERVERURL, for the IRC bot to use if set 2015-06-17 10:00:35 +01:00
PsiOmegaDelta 772488fadc Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/setup.dm
	maps/exodus-1.dmm
	maps/exodus-5.dmm
 2015-06-17 09:33:34 +02:00
Zuhayr 031c7db3e5 Merge pull request #9821 from mwerezak/tableshaveturned 
Makes standard tables plastic, related changes
 2015-06-17 14:35:22 +09:30
mwerezak 73333ac9c8 Moves metabolism to a holder subtype 2015-06-16 16:26:06 -04:00
mwerezak 70433b4367 Makes showers wash away touching reagents 
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
 2015-06-16 16:26:04 -04:00
mwerezak 4cb70b2b94 Ingesting diseased blood contracts the disease 
Only if the disease is a contact type disease. The same restriction is
also applied to touching diseased blood.
 2015-06-16 16:26:02 -04:00
PsiOmegaDelta 5ac575f579 Yet another span fix. 2015-06-16 11:09:36 +02:00
PsiOmegaDelta 307f36e919 Compilation fixes. 2015-06-16 11:03:25 +02:00
PsiOmegaDelta 06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-06-16 10:52:33 +02:00
PsiOmegaDelta 37f59551fc Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/modules/reagents/reagent_containers/glass.dm
 2015-06-16 10:30:50 +02:00
PsiOmegaDelta cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
Chinsky c96fee8942 Merge pull request #9819 from PsiOmegaDelta/150614-SpanMatch 
Travis span matcher script
 2015-06-16 03:40:10 +03:00
PsiOmega 6373f3391f Fixes #9219. 
Editing lists is now logged.
 2015-06-15 18:29:07 +02:00
PsiOmegaDelta 93c3d03801 Merge pull request #9817 from GinjaNinja32/records 
'Fixes' NanoUI locking up on medical/security records
 2015-06-15 15:30:08 +02:00
GinjaNinja32 0423691ca2 Missed a span 2015-06-15 12:20:16 +01:00
GinjaNinja32 4da75dba68 Fixes some more unbalanced HTML 2015-06-15 10:48:30 +01:00
mwerezak 637306eb14 Adds holographic plastic 2015-06-14 22:18:11 -04:00
PsiOmega 0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
mwerezak eb0f1fa69e Makes R-walls double plasteel 
Makes R-walls double plasteel like on master, adjusts plasteel integrity
so that R-walls have the same health as on master as well.
 2015-06-14 15:33:48 -04:00
mwerezak 0d6dfd899a Makes standard tables plastic 
Makes standard tables plastic, readds steel tables to various places,
mainly around engineering and maintenance. Makes shuttle tables
reinforced.
 2015-06-14 13:38:56 -04:00
GinjaNinja32 3c525e907a 'Fixes' NanoUI locking up on medical/security records 2015-06-14 14:44:38 +01:00
PsiOmega 1a7e8976af mob/living/Life() now handles fire. 
Aliens (largery un-used on Bay) and robots now deal with fire differently.
 2015-06-14 11:47:11 +02:00
PsiOmega 03be640d01 mob/living/Life() now handles random events (vomiting etc). 2015-06-14 11:17:04 +02:00
PsiOmega a14406f83a mob/living/Life() now handles blood. 2015-06-14 11:14:31 +02:00
PsiOmega 240aed884e mob/living/Life() now handles chemicals in the body. 2015-06-14 11:03:03 +02:00
PsiOmega 9d90691605 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
 2015-06-14 10:35:29 +02:00