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
25,621 Commits 10 Branches 0 Tags
4b5899fa3023e88209f4a27a84bb0af72b3d95e1
Commit Graph

11664 Commits

Author SHA1 Message Date
GinjaNinja32
4b5899fa30 Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct 
Corrects two ex_acts.
 2015-06-21 13:16:23 +01:00
PsiOmegaDelta
8100f286a6 Corrects two ex_acts. 
Decreases immovable rod severity to match other ex_acts in file.
Increases meteor gun ex_act severity.
 2015-06-21 13:26:48 +02:00
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
GinjaNinja32
7f319f528a Merge pull request #9875 from Zuhayr/dev-freeze 
Antag system fixes
 2015-06-21 12:07:50 +01:00
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta
3d572ccc27 Merge pull request #9874 from mwerezak/fixes 
Dev-freeze Fixes
 2015-06-21 09:04:08 +02:00
PsiOmegaDelta
9426d0844c Merge pull request #9872 from mwerezak/earslot 
Fixes #9514
 2015-06-21 09:03:00 +02:00
mwerezak
80c80abe3a Fixes #9511 2015-06-21 03:00:37 -04:00
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
Zuhayr
7473d18ecb Merge pull request #9795 from hockeygoalie5/iaasuit 
Internal Affairs Hardsuit (and a new pen!)
 2015-06-21 13:24:13 +09:30
PsiOmegaDelta
405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm
 2015-06-20 20:40:06 +02:00
Mustafa Kalash
ac032f70fc Changes the module from a watch to the horrible tie. Renames module to augmented tie. Moves module to the ERT ready room. 2015-06-20 14:26:37 -04:00
PsiOmegaDelta
4a5da7221c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/resist.dm
 2015-06-20 20:24:05 +02:00
Mustafa Kalash
bb370a66f3 Merge remote-tracking branch 'upstream/dev' into iaasuit 2015-06-20 14:07:44 -04:00
PsiOmegaDelta
33dc2e5811 Merge pull request #9867 from Zuhayr/dev-freeze 
More fixes
 2015-06-20 19:05:32 +02:00
GinjaNinja32
82aa88c777 Merge pull request #9862 from Zuhayr/dev 
Fixes
 2015-06-20 17:27:26 +01:00
Zuhayr
6fff0069db Fixes # #8327 2015-06-21 01:48:15 +09:30
Zuhayr
7c1696c3c8 Fixes #9435 2015-06-21 01:27:23 +09:30
Zuhayr
6f00d831e5 Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct 
Base proc: emag_act
 2015-06-21 01:18:25 +09:30
Zuhayr
f371da4ae9 Merge pull request #9838 from mwerezak/stunrevolver 
Assorted small dev-freeze tweaks, stunrevolver fix
 2015-06-21 01:16:58 +09:30
Zuhayr
7d9378748d Comments out fire and rads for material objects since they are very imbalanced atm. 2015-06-20 22:48:08 +09:30
Zuhayr
56b68b9abe Fixes #9847 2015-06-20 22:15:38 +09:30
Zuhayr
e13c4a2243 Fixes #7828 2015-06-20 21:57:03 +09:30
Zuhayr
7d710f2019 Fixes #8471 2015-06-20 21:54:22 +09:30
Zuhayr
1e56cc0914 Fixes #9836 2015-06-20 21:43:54 +09:30
Zuhayr
062f06ecb9 Fixes #9835 2015-06-20 21:00:02 +09:30
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
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
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